Merge pull request #109 from wizjany/master

Ghast fireballs and explosion cancelling

src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java

@@ -93,6 +93,7 @@ public class WorldConfiguration {
     public boolean teleportOnSuffocation;
     public boolean disableVoidDamage;
     public boolean teleportOnVoid;
+    public boolean disableExplosionDamage;
     public boolean useRegions;
     public boolean highFreqFlags;
     public int regionWand = 287;
@@ -194,6 +195,7 @@ private void loadConfiguration() {
         teleportOnSuffocation = config.getBoolean("player-damage.teleport-on-suffocation", false);
         disableVoidDamage = config.getBoolean("player-damage.disable-void-damage", false);
         teleportOnVoid = config.getBoolean("player-damage.teleport-on-void-falling", false);
+        disableExplosionDamage = config.getBoolean("player-damage.disable-explosion-damage", false);
 
         signChestProtection = config.getBoolean("chest-protection.enable", false);
 

src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java

@@ -108,6 +108,7 @@ public void onEntityDamageByBlock(EntityDamageByBlockEvent event) {
 
             if (wcfg.disableLavaDamage && type == DamageCause.LAVA) {
                 event.setCancelled(true);
+                if (cfg.hasGodMode(player)) player.setFireTicks(0);
                 return;
             }
 
@@ -127,6 +128,10 @@ public void onEntityDamageByBlock(EntityDamageByBlockEvent event) {
                 return;
             }
 
+            if (wcfg.disableExplosionDamage && event.getCause() == DamageCause.BLOCK_EXPLOSION) {
+                event.setCancelled(true);
+                return;
+            }
         }
     }
 
@@ -150,6 +155,11 @@ public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
                 return;
             }
 
+            if (wcfg.disableExplosionDamage && event.getCause() == DamageCause.ENTITY_EXPLOSION) {
+                event.setCancelled(true);
+                return;
+            }
+
             if (attacker != null && attacker instanceof Player) {
                 if (wcfg.useRegions) {
                     Vector pt = toVector(defender.getLocation());
@@ -268,6 +278,7 @@ public void onEntityDamage(EntityDamageEvent event) {
 
             if (cfg.hasGodMode(player)) {
                 event.setCancelled(true);
+                player.setFireTicks(0);
                 return;
             }
 
@@ -326,8 +337,9 @@ public void onEntityExplode(EntityExplodeEvent event) {
         Location l = event.getLocation();
         World world = l.getWorld();
         WorldConfiguration wcfg = cfg.get(world);
+        Entity ent = event.getEntity();
 
-        if (event.getEntity() instanceof LivingEntity) {
+        if (ent instanceof LivingEntity) {
             if (wcfg.blockCreeperBlockDamage) {
                 event.setCancelled(true);
                 return;
@@ -347,7 +359,17 @@ public void onEntityExplode(EntityExplodeEvent event) {
                     return;
                 }
             }
-        } else { // Shall assume that this is TNT
+        } else if (ent instanceof Fireball) {
+            if (wcfg.useRegions) {
+                Vector pt = toVector(l);
+                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+
+                if (!mgr.getApplicableRegions(pt).allows(DefaultFlag.GHAST_FIREBALL)) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+        } else if (ent instanceof TNTPrimed) {
             if (wcfg.blockTNT) {
                 event.setCancelled(true);
                 return;

src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java

@@ -29,8 +29,9 @@ public final class DefaultFlag {
     public static final StateFlag BUILD = new StateFlag("build", 'b', true);
     public static final StateFlag PVP = new StateFlag("pvp", 'p', true);
     public static final StateFlag MOB_DAMAGE = new StateFlag("mob-damage", 'm', true);
-    public static final StateFlag MOB_SPAWNING = new StateFlag("mob-spawning", 'M', true);
+    public static final StateFlag MOB_SPAWNING = new StateFlag("mob-spawning", true);
     public static final StateFlag CREEPER_EXPLOSION = new StateFlag("creeper-explosion", 'c', true);
+    public static final StateFlag GHAST_FIREBALL = new StateFlag("ghast-fireball", true);
     public static final StateFlag SLEEP = new StateFlag("sleep", true);
     public static final StateFlag TNT = new StateFlag("tnt", 't', true);
     public static final StateFlag LIGHTER = new StateFlag("lighter", 'l', true);
@@ -62,7 +63,8 @@ public final class DefaultFlag {
         TNT, LIGHTER, FIRE_SPREAD, LAVA_FIRE, CHEST_ACCESS, WATER_FLOW, LAVA_FLOW,
         USE, PLACE_VEHICLE, GREET_MESSAGE, FAREWELL_MESSAGE, NOTIFY_GREET,
         NOTIFY_FAREWELL, DENY_SPAWN, HEAL_DELAY, HEAL_AMOUNT, TELE_LOC,
-        TELE_PERM, SPAWN_LOC, SPAWN_PERM, BUYABLE, PRICE, SNOW_FALL
+        TELE_PERM, SPAWN_LOC, SPAWN_PERM, BUYABLE, PRICE, SNOW_FALL,
+        GHAST_FIREBALL
     };
     
     private DefaultFlag() {

src/main/resources/config_world.yml

@@ -81,6 +81,7 @@ player-damage:
     teleport-on-suffocation: off
     disable-void-damage: off
     teleport-on-void-falling: off
+    disable-explosion-damage: off
 
 regions:
     enable: on