Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-23 17:47:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #360 from GunfighterJ/patch-15

Browse Source 
[Protect] Prevent creepers from breaking paintings if their explosions a...
This commit is contained in:
Iaccidentally 2013-02-25 18:46:44 -08:00
commit bf8f0365d9
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
View File

@ -13,6 +13,8 @@ import org.bukkit.event.Listener;
import org.bukkit.event.entity.*;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.EntityTargetEvent.TargetReason;
import org.bukkit.event.hanging.HangingBreakByEntityEvent;
import org.bukkit.event.hanging.HangingBreakEvent;
public class EssentialsProtectEntityListener implements Listener
@ -176,7 +178,7 @@ public class EssentialsProtectEntityListener implements Listener
private boolean shouldBeDamaged(final User user, final String type)
{
return (user.isAuthorized("essentials.protect.damage.".concat(type))
&& !user.isAuthorized("essentials.protect.damage.disable"));
&& !user.isAuthorized("essentials.protect.damage.disable"));
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
@ -232,7 +234,7 @@ public class EssentialsProtectEntityListener implements Listener
event.setCancelled(true);
return;
}
// This code will prevent explosions near protected rails, signs or protected chests
// TODO: Use protect db instead of this code
@ -332,4 +334,15 @@ public class EssentialsProtectEntityListener implements Listener
event.setCancelled(true);
}
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onPaintingBreak(HangingBreakByEntityEvent event)
{
if (event.getCause() == HangingBreakEvent.RemoveCause.ENTITY
&& event.getRemover() instanceof Creeper
&& prot.getSettingBool(ProtectConfig.prevent_creeper_explosion))
{
event.setCancelled(true);
}
}
}