Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-27 21:15:57 +01:00
Code Issues Projects Releases Wiki Activity

Wither skulls should be handled separately from fireballs

Browse Source
This commit is contained in:
Wizjany 2013-01-15 18:23:53 -05:00
parent 3e06000fd9
commit 4398c781c5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java
View File

@ -41,6 +41,8 @@
import org.bukkit.entity.TNTPrimed; import org.bukkit.entity.TNTPrimed;
import org.bukkit.entity.Tameable; import org.bukkit.entity.Tameable;
import org.bukkit.entity.ThrownPotion; import org.bukkit.entity.ThrownPotion;
import org.bukkit.entity.Wither;
import org.bukkit.entity.WitherSkull;
import org.bukkit.entity.Wolf; import org.bukkit.entity.Wolf;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
@ -533,7 +535,7 @@ public void onEntityExplode(EntityExplodeEvent event) {
// Not all explosions come from an entity // Not all explosions come from an entity
if (ent != null) { if (ent != null) {
if (ent.getType() == witherType) { if (ent instanceof Wither) {
if (wcfg.blockWitherBlockDamage) { if (wcfg.blockWitherBlockDamage) {
event.blockList().clear(); event.blockList().clear();
event.setCancelled(true); event.setCancelled(true);
@ -546,7 +548,7 @@ public void onEntityExplode(EntityExplodeEvent event) {
} }
} }
if (ent.getType() == witherSkullType) { if (ent instanceof WitherSkull) {
if (wcfg.blockWitherSkullBlockDamage) { if (wcfg.blockWitherSkullBlockDamage) {
event.blockList().clear(); event.blockList().clear();
event.setCancelled(true); event.setCancelled(true);
@ -625,7 +627,7 @@ public void onEntityExplode(EntityExplodeEvent event) {
} }
} }
} }
} else if (ent instanceof Fireball) { } else if (ent instanceof Fireball && !(ent instanceof WitherSkull)) {
if (wcfg.blockFireballBlockDamage) { if (wcfg.blockFireballBlockDamage) {
event.blockList().clear(); event.blockList().clear();
event.setCancelled(true); event.setCancelled(true);