Fixing bug where you respawn and are still casting if keepinventory i…

…s set to true
iron431 · Apr 30, 2023 · 487a067 · 487a067
1 parent e3eeb7a
commit 487a067
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/main/java/io/redspace/ironsspellbooks/player/ServerPlayerEvents.java b/src/main/java/io/redspace/ironsspellbooks/player/ServerPlayerEvents.java
@@ -19,10 +19,7 @@
 import net.minecraft.world.item.SwordItem;
 import net.minecraftforge.event.ItemAttributeModifierEvent;
 import net.minecraftforge.event.entity.EntityMountEvent;
-import net.minecraftforge.event.entity.living.LivingAttackEvent;
-import net.minecraftforge.event.entity.living.LivingDamageEvent;
-import net.minecraftforge.event.entity.living.LivingEquipmentChangeEvent;
-import net.minecraftforge.event.entity.living.LivingExperienceDropEvent;
+import net.minecraftforge.event.entity.living.*;
 import net.minecraftforge.event.entity.player.PlayerContainerEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -130,6 +127,17 @@ public static void onPlayerCloned(PlayerEvent.Clone event) {
         event.getEntity().setTicksFrozen(0);
     }
 
+    @SubscribeEvent
+    public static void onLivingDeathEvent(LivingDeathEvent event) {
+        //IronsSpellbooks.LOGGER.debug("onLivingDeathEvent: {} {}", event.getEntity().getName().getString(), event.getEntity().isDeadOrDying());
+        event.getEntity().clearFire();
+        event.getEntity().setTicksFrozen(0);
+        if (event.getEntity() instanceof ServerPlayer serverPlayer) {
+            //IronsSpellbooks.LOGGER.debug("onLivingDeathEvent: {}", serverPlayer.getName().getString());
+            Utils.serverSideCancelCast(serverPlayer);
+        }
+    }
+
     @SubscribeEvent
     public static void onPlayerChangedDimension(PlayerEvent.PlayerChangedDimensionEvent event) {
  //Ironsspellbooks.logger.debug("PlayerChangedDimension: {}", event.getEntity().getName().getString());