From 514ca6a61e1d844f26d4d3c3e96c00901e5a701f Mon Sep 17 00:00:00 2001 From: Nybashirka <92296042+Viptunbeqwfwew@users.noreply.github.com> Date: Fri, 20 Mar 2026 09:42:59 +0900 Subject: [PATCH] Bugfix for another pull request. (#260) Co-authored-by: Martin Robertz Co-authored-by: Ruling-0 <47913168+Ruling-0@users.noreply.github.com> --- .../armor/player/TPlayerHandler.java | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/java/tconstruct/armor/player/TPlayerHandler.java b/src/main/java/tconstruct/armor/player/TPlayerHandler.java index d6524506..bd12525b 100644 --- a/src/main/java/tconstruct/armor/player/TPlayerHandler.java +++ b/src/main/java/tconstruct/armor/player/TPlayerHandler.java @@ -26,6 +26,7 @@ import net.minecraftforge.event.entity.player.PlayerDropsEvent; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent; @@ -222,24 +223,24 @@ public class TPlayerHandler { } public void playerDeath(LivingDeathEvent event) { - if (!(event.entity instanceof EntityPlayer)) return; + if (!(event.entity instanceof EntityPlayer player)) return; - if (!event.entity.worldObj.isRemote) { - TPlayerStats properties = (TPlayerStats) event.entity.getExtendedProperties(TPlayerStats.PROP_NAME); - properties.hunger = ((EntityPlayer) event.entity).getFoodStats().getFoodLevel(); - playerStats.put(event.entity.getPersistentID(), properties); + if (!player.worldObj.isRemote) { + TPlayerStats properties = TPlayerStats.get(player); + + properties.level = player.experienceLevel / 2; + int hunger = player.getFoodStats().getFoodLevel(); + if (hunger < 6) properties.hunger = 6; + else properties.hunger = player.getFoodStats().getFoodLevel(); + + playerStats.put(player.getPersistentID(), properties); } } public void playerDrops(PlayerDropsEvent evt) { // After playerDeath event. Modifying saved data. TPlayerStats stats = playerStats.get(evt.entityPlayer.getPersistentID()); - - stats.level = evt.entityPlayer.experienceLevel / 2; - // stats.health = 20; - int hunger = evt.entityPlayer.getFoodStats().getFoodLevel(); - if (hunger < 6) stats.hunger = 6; - else stats.hunger = evt.entityPlayer.getFoodStats().getFoodLevel(); + if (stats == null) stats = TPlayerStats.get(evt.entityPlayer); if (evt.entityPlayer.capturedDrops != evt.drops) { evt.entityPlayer.capturedDrops.clear(); @@ -345,7 +346,8 @@ public class TPlayerHandler { TPlayerHandler.this.livingFall(evt); } - @SubscribeEvent + // EventPriority.LOW to maintain the order of calling logic from playerDrops + @SubscribeEvent(priority = EventPriority.LOW) public void playerDeathWrapper(LivingDeathEvent event) { TPlayerHandler.this.playerDeath(event); }