From 83e89b3772edfa7537da607658264a86f303f2f2 Mon Sep 17 00:00:00 2001 From: RoboMWM Date: Tue, 19 Jan 2021 17:29:53 -0800 Subject: [PATCH] remove unused lightning strike event handler --- .../me/ryanhamshire/GriefPrevention/BlockEventHandler.java | 4 +--- .../ryanhamshire/GriefPrevention/EntityEventHandler.java | 7 ------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/BlockEventHandler.java b/src/main/java/me/ryanhamshire/GriefPrevention/BlockEventHandler.java index 868bad2..5768dad 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/BlockEventHandler.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/BlockEventHandler.java @@ -720,9 +720,7 @@ public class BlockEventHandler implements Listener if (igniteEvent.getCause() == IgniteCause.LIGHTNING && GriefPrevention.instance.dataStore.getClaimAt(igniteEvent.getIgnitingEntity().getLocation(), false, null) != null) { -// if(igniteEvent.getIgnitingEntity().hasMetadata("GP_TRIDENT")){ //BlockIgniteEvent is called before LightningStrikeEvent. See #532 - igniteEvent.setCancelled(true); -// } + igniteEvent.setCancelled(true); //BlockIgniteEvent is called before LightningStrikeEvent. See #532. However, see #1125 for further discussion on detecting trident-caused lightning. } // If a fire is started by a fireball from a dispenser, allow it if the dispenser is in the same claim. diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java b/src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java index 9f51373..bd3e061 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java @@ -133,13 +133,6 @@ public class EntityEventHandler implements Listener } } - @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) - public void onLightningStrike(LightningStrikeEvent event) - { - if (event.getCause() == LightningStrikeEvent.Cause.TRIDENT) - event.getLightning().setMetadata("GP_TRIDENT", new FixedMetadataValue(GriefPrevention.instance, event.getLightning().getLocation())); - } - @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) public void onEntityChangeBLock(EntityChangeBlockEvent event) {