AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-27 01:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate some errors.

Browse Source
This commit is contained in:
Steven Lawson 2011-10-27 20:37:30 -04:00
parent 91eae5163d
commit 342ece9934
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/me/StevenLawson/TotalFreedomMod/Commands/Command_expel.java
View File

@ -50,7 +50,17 @@ public class Command_expel extends TFM_Command
if (!p.equals(sender_p)) if (!p.equals(sender_p))
{ {
Location target_pos = p.getLocation(); Location target_pos = p.getLocation();
if (target_pos.distance(sender_pos) < radius)
boolean in_range = false;
try
{
in_range = target_pos.distance(sender_pos) < radius;
}
catch (IllegalArgumentException ex)
{
}
if (in_range)
{ {
sender.sendMessage("Pushing " + p.getName()); sender.sendMessage("Pushing " + p.getName());
Vector expel_direction = target_pos.subtract(sender_pos).toVector().normalize(); Vector expel_direction = target_pos.subtract(sender_pos).toVector().normalize();

8
src/me/StevenLawson/TotalFreedomMod/Commands/Command_radar.java
View File

@ -31,7 +31,13 @@ public class Command_radar extends TFM_Command
{ {
if (!p.equals(sender_p)) if (!p.equals(sender_p))
{ {
radar_data.add(new TFM_RadarData(p, sender_pos.distance(p.getLocation()), p.getLocation())); try
{
radar_data.add(new TFM_RadarData(p, sender_pos.distance(p.getLocation()), p.getLocation()));
}
catch (IllegalArgumentException ex)
{
}
} }
} }

14
src/me/StevenLawson/TotalFreedomMod/TFM_Heartbeat.java
View File

@ -31,15 +31,21 @@ public class TFM_Heartbeat implements Runnable
if (plugin.disableNight) if (plugin.disableNight)
{ {
for (World world : Bukkit.getWorlds()) try
{ {
if (world.getTime() > 12000L) for (World world : Bukkit.getWorlds())
{ {
TFM_Util.setWorldTime(world, 1000L); if (world.getTime() > 12000L)
{
TFM_Util.setWorldTime(world, 1000L);
}
} }
} }
catch (NullPointerException ex)
{
}
} }
if (plugin.disableWeather) if (plugin.disableWeather)
{ {
for (World world : Bukkit.getWorlds()) for (World world : Bukkit.getWorlds())