From 1dc5a0f2266c76321a2dc50cc5fcc93f06453b25 Mon Sep 17 00:00:00 2001 From: Brettflan Date: Sat, 28 Jan 2012 04:07:21 -0600 Subject: [PATCH] removed TNT exploit handling code, since they did finally fix the bug in the CraftBukkit 1.1-RC1 release --- src/com/massivecraft/factions/P.java | 1 - .../listeners/FactionsEntityListener.java | 41 ------------------- 2 files changed, 42 deletions(-) diff --git a/src/com/massivecraft/factions/P.java b/src/com/massivecraft/factions/P.java index 15529d0d..b8b55bd5 100644 --- a/src/com/massivecraft/factions/P.java +++ b/src/com/massivecraft/factions/P.java @@ -132,7 +132,6 @@ public class P extends MPlugin this.registerEvent(Event.Type.ENTITY_TARGET, this.entityListener, Event.Priority.Normal); this.registerEvent(Event.Type.PAINTING_BREAK, this.entityListener, Event.Priority.Normal); this.registerEvent(Event.Type.PAINTING_PLACE, this.entityListener, Event.Priority.Normal); - this.registerEvent(Event.Type.EXPLOSION_PRIME, this.entityListener, Event.Priority.Normal); // Block Events this.registerEvent(Event.Type.BLOCK_BREAK, this.blockListener, Event.Priority.Normal); diff --git a/src/com/massivecraft/factions/listeners/FactionsEntityListener.java b/src/com/massivecraft/factions/listeners/FactionsEntityListener.java index c6426d50..c53e36d2 100644 --- a/src/com/massivecraft/factions/listeners/FactionsEntityListener.java +++ b/src/com/massivecraft/factions/listeners/FactionsEntityListener.java @@ -94,47 +94,6 @@ public class FactionsEntityListener extends EntityListener }*/ } - @Override - public void onExplosionPrime(ExplosionPrimeEvent event) - { - if (event.isCancelled()) return; - if (! (event.getEntity() instanceof TNTPrimed)) return; - if (exploitExplosions.isEmpty()) return; - - // make sure this isn't a TNT explosion exploit attempt - - int locX = event.getEntity().getLocation().getBlockX(); - int locZ = event.getEntity().getLocation().getBlockZ(); - - for (int i = exploitExplosions.size() - 1; i >= 0; i--) - { - PotentialExplosionExploit ex = exploitExplosions.get(i); - - // remove anything from the list older than 10 seconds (TNT takes 4 seconds to trigger; provide some leeway) - if (ex.timeMillis + 10000 < System.currentTimeMillis()) - { - exploitExplosions.remove(i); - continue; - } - - int absX = Math.abs(ex.X - locX); - int absZ = Math.abs(ex.Z - locZ); - if (absX < 5 && absZ < 5) - { // it sure looks like an exploit attempt - // let's tattle on him to everyone - String msg = "NOTICE: Player \""+ex.playerName+"\" attempted to exploit a TNT bug in the territory of \""+ex.faction.getTag()+"\" at "+ex.X+","+ex.Z+" (X,Z) using "+ex.item.name(); - P.p.log(Level.WARNING, msg); - for (FPlayer fplayer : FPlayers.i.getOnline()) - { - fplayer.sendMessage(msg); - } - event.setCancelled(true); - exploitExplosions.remove(i); - return; - } - } - } - @Override public void onEntityExplode(EntityExplodeEvent event) {