Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-07-01 17:04:47 +02:00
Code Issues Projects Releases Wiki Activity

Fix one last witherskull/fireball conflict

Browse Source
This commit is contained in:
wizjany 2013-03-22 19:28:18 -04:00
parent 0cf87ae561
commit 1bd367ddde
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;