From 3c77945e12d5ffd159f3dd725d6f77fa36bd23e2 Mon Sep 17 00:00:00 2001 From: bconlon Date: Wed, 3 Jun 2020 18:51:43 -0700 Subject: [PATCH] Lightning from the Lightning Sword no longer damages the player. --- .../java/com/legacy/aether/AetherEventHandler.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/com/legacy/aether/AetherEventHandler.java b/src/main/java/com/legacy/aether/AetherEventHandler.java index b2885d9..70d09b8 100644 --- a/src/main/java/com/legacy/aether/AetherEventHandler.java +++ b/src/main/java/com/legacy/aether/AetherEventHandler.java @@ -14,6 +14,7 @@ import net.minecraft.util.EntityDamageSource; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraft.world.World; +import net.minecraftforge.event.entity.EntityStruckByLightningEvent; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.entity.player.EntityInteractEvent; import net.minecraftforge.event.entity.player.FillBucketEvent; @@ -214,6 +215,15 @@ AetherEventHandler { } } + @SubscribeEvent + public void onEntityHurt(EntityStruckByLightningEvent event) + { + if (event.entity instanceof EntityPlayer) + { + event.setCanceled(true); + } + } + public boolean isGravititeTool(Item stackID) { return stackID == ItemsAether.gravitite_shovel || stackID == ItemsAether.gravitite_axe || stackID == ItemsAether.gravitite_pickaxe; }