Fixed a join bug

This commit is contained in:
Garbage Mule
2011-07-16 23:01:23 +02:00
parent c84158aeb9
commit cc02c067eb
4 changed files with 5 additions and 4 deletions
BIN
View File
Binary file not shown.
+1 -1
View File
@@ -408,7 +408,7 @@ public class Arena
spawnThread.updateTargets(); spawnThread.updateTargets();
// Has to be delayed for TombStone not to fuck shit up. // Has to be delayed for TombStone not to fuck shit up.
Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(plugin, Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(plugin,
new Runnable() new Runnable()
{ {
public void run() public void run()
+2 -1
View File
@@ -171,7 +171,8 @@ public class MACommands implements CommandExecutor
// If there was an error, don't join. // If there was an error, don't join.
if (error) if (error)
{ {
arena.refund(p); if (arena != null)
arena.refund(p);
return true; return true;
} }
+2 -2
View File
@@ -608,7 +608,7 @@ public class MAUtils
/** /**
* Removes all the pets belonging to this player. * Removes all the pets belonging to this player.
*/ *//*
public static void clearPets(Arena arena, Player p) public static void clearPets(Arena arena, Player p)
{ {
for (Wolf w : arena.pets) for (Wolf w : arena.pets)
@@ -616,7 +616,7 @@ public class MAUtils
if (w.getOwner().equals(p)) if (w.getOwner().equals(p))
w.remove(); w.remove();
} }
} }*/