Merge branch 'master' of github.com:khobbits/Essentials

Conflicts:
	Essentials/src/com/earth2me/essentials/commands/Commandhelp.java

2 files changed, 14 insertions, 4 deletions

diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
index 42a55c874..f8166b1d5 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
@@ -13,7 +13,9 @@ import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;

 import org.bukkit.craftbukkit.CraftServer;

 import org.bukkit.craftbukkit.CraftWorld;

+import org.bukkit.craftbukkit.entity.CraftFireball;

 import org.bukkit.craftbukkit.entity.CraftPlayer;

+import org.bukkit.craftbukkit.entity.CraftTNTPrimed;

 import org.bukkit.entity.Creeper;

 import org.bukkit.entity.Entity;

 import org.bukkit.entity.LivingEntity;

@@ -125,6 +127,7 @@ public class EssentialsProtectEntityListener extends EntityListener
 				 && !user.isAuthorized("essentials.protect.damage.disable")))

 		{

 			event.setCancelled(true);

+			((EntityDamageByProjectileEvent)event).setBounce(true);

 			return;

 		}

 

@@ -215,17 +218,23 @@ public class EssentialsProtectEntityListener extends EntityListener
 				}

 			}

 

-			((CraftServer)ess.getServer()).getHandle().a(loc.getX(), loc.getY(), loc.getZ(), 64.0D, ((CraftWorld)loc.getWorld()).getHandle().worldProvider.dimension,

+			((CraftServer)ess.getServer()).getHandle().sendPacketNearby(loc.getX(), loc.getY(), loc.getZ(), 64.0D, ((CraftWorld)loc.getWorld()).getHandle().worldProvider.dimension,

 														  new Packet60Explosion(loc.getX(), loc.getY(), loc.getZ(), 3.0f, set));

 			event.setCancelled(true);

 			return;

 		}

-		else if (!(event.getEntity() instanceof LivingEntity)

+		else if (event.getEntity() instanceof CraftTNTPrimed

 				 && prot.getSettingBool(ProtectConfig.prevent_tnt_explosion))

 		{

 			event.setCancelled(true);

 			return;

 		}

+		else if (event.getEntity() instanceof CraftFireball

+				 && prot.getSettingBool(ProtectConfig.prevent_fireball_explosion))

+		{

+			event.setCancelled(true);

+			return;

+		}

 		// This code will prevent explosions near protected rails, signs or protected chests

 		// TODO: Use protect db instead of this code

 

@@ -249,12 +258,12 @@ public class EssentialsProtectEntityListener extends EntityListener
 				event.setCancelled(true);

 				return;

 			}

-			if (EssentialsBlockListener.protectedBlocks.contains(block.getType())

+			/*if (EssentialsBlockListener.protectedBlocks.contains(block.getType())

 				&& EssentialsBlockListener.isBlockProtected(block))

 			{

 				event.setCancelled(true);

 				return;

-			}

+			}*/

 		}

 	}

 

diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectConfig.java b/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectConfig.java
index d9161bda8..75824c368 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectConfig.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectConfig.java
@@ -31,6 +31,7 @@ public enum ProtectConfig
 	prevent_portal_creation("protect.prevent.portal-creation", false),
 	prevent_block_on_rail("protect.protect.prevent-block-on-rails", false),
 	prevent_tnt_explosion("protect.prevent.tnt-explosion", false),
+	prevent_fireball_explosion("protect.prevent.fireball-explosion", false),
 	prevent_creeper_explosion("protect.prevent.creeper-explosion", true),
 	prevent_creeper_playerdmg("protect.prevent.creeper-playerdamage", false),
 	prevent_creeper_blockdmg("protect.prevent.creeper-blockdamage", false),