From 1bd367dddef7efb35b440fa834ca5a9f565a609e Mon Sep 17 00:00:00 2001 From: wizjany Date: Fri, 22 Mar 2013 19:28:18 -0400 Subject: [PATCH] Fix one last witherskull/fireball conflict --- .../worldguard/bukkit/WorldGuardEntityListener.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java index 39526065..e9f688d9 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java @@ -295,9 +295,16 @@ private void onEntityDamageByEntity(EntityDamageByEntityEvent event) { } if (attacker instanceof Fireball) { - if (wcfg.blockFireballExplosions) { - event.setCancelled(true); - return; + if (attacker instanceof WitherSkull) { + if (wcfg.blockWitherSkullExplosions) { + event.setCancelled(true); + return; + } + } else { + if (wcfg.blockFireballExplosions) { + event.setCancelled(true); + return; + } } if (wcfg.useRegions) { Fireball fireball = (Fireball) attacker;