Fixed bugs

This commit is contained in:
travja 2013-03-28 15:43:17 -06:00
parent 563e453a26
commit 1ebab85ead
7 changed files with 24 additions and 21 deletions

Binary file not shown.

View File

@ -41,7 +41,8 @@ public class BlockStorage implements Listener {
if (plugin.getArena(p) != null || !protall) { if (plugin.getArena(p) != null || !protall) {
//int a = this.plugin.getArena(p).intValue(); //int a = this.plugin.getArena(p).intValue();
int a = 1; //Jeppa: define a default (may be needed if protall is true) int a = 1; //Jeppa: define a default (may be needed if protall is true)
if (plugin.getArena(p) != null) a = plugin.getArena(p); if (plugin.getArena(p) != null){
a = plugin.getArena(p);
if (!event.isCancelled() && plugin.Playing.get(a).contains(pname)){ if (!event.isCancelled() && plugin.Playing.get(a).contains(pname)){
if (plugin.config.getString("Protected_Arena").equalsIgnoreCase("True")) { if (plugin.config.getString("Protected_Arena").equalsIgnoreCase("True")) {
event.setCancelled(true); event.setCancelled(true);
@ -69,6 +70,7 @@ public class BlockStorage implements Listener {
} }
} }
} }
}
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void Explosion(EntityExplodeEvent event){ public void Explosion(EntityExplodeEvent event){
List<Block> blocksd = event.blockList(); List<Block> blocksd = event.blockList();

View File

@ -450,6 +450,7 @@ public class Main extends JavaPlugin{
} }
}else }else
getServer().broadcastMessage(ChatColor.GREEN + "Grace period is over, FIGHT!"); getServer().broadcastMessage(ChatColor.GREEN + "Grace period is over, FIGHT!");
getServer().getScheduler().cancelTask(grace);
} }
} }
},20L, 20L); },20L, 20L);