From 74239ba15fce50639ff5e08d3365da81b11e4bab Mon Sep 17 00:00:00 2001 From: ryanhamshire Date: Wed, 20 Jan 2016 11:30:58 -0800 Subject: [PATCH] Revert "Revert "Reduced projectile ban to splash potions."" This reverts commit 5e3aa30e2125cc325080359b297d96d21e3fbf08. --- .../ryanhamshire/GriefPrevention/EntityEventHandler.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java index 520af1d..3b08302 100644 --- a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java @@ -78,6 +78,7 @@ import org.bukkit.event.hanging.HangingBreakByEntityEvent; import org.bukkit.event.hanging.HangingBreakEvent; import org.bukkit.event.hanging.HangingBreakEvent.RemoveCause; import org.bukkit.event.hanging.HangingPlaceEvent; +import org.bukkit.event.inventory.InventoryMoveItemEvent; import org.bukkit.event.vehicle.VehicleDamageEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.metadata.FixedMetadataValue; @@ -101,9 +102,13 @@ public class EntityEventHandler implements Listener @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) public void onProjectileFire(ProjectileLaunchEvent event) { - if(GriefPrevention.instance.creativeRulesApply(event.getEntity().getLocation())) + EntityType type = event.getEntityType(); + if(type == EntityType.SPLASH_POTION) { - event.setCancelled(true); + if(GriefPrevention.instance.creativeRulesApply(event.getEntity().getLocation())) + { + event.setCancelled(true); + } } }