From 6c9a21d45998562ecfcadc16d7230ea442dcbd95 Mon Sep 17 00:00:00 2001 From: Kam Date: Fri, 24 May 2024 16:56:56 -0400 Subject: [PATCH] Fix Animals with Soulstones Requiring NPC Interaction --- src/main/java/noppes/npcs/ServerEventsHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/noppes/npcs/ServerEventsHandler.java b/src/main/java/noppes/npcs/ServerEventsHandler.java index 9b265d754..f482fa0cc 100644 --- a/src/main/java/noppes/npcs/ServerEventsHandler.java +++ b/src/main/java/noppes/npcs/ServerEventsHandler.java @@ -69,7 +69,7 @@ public class ServerEventsHandler { return; } - if(!isRemote && item.getItem() == CustomItems.soulstoneEmpty && npcInteracted) { + if(!isRemote && item.getItem() == CustomItems.soulstoneEmpty) { ((ItemSoulstoneEmpty)item.getItem()).store((EntityLivingBase)event.target, item, event.entityPlayer); if(ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER){ LogWriter.script(String.format("[%s] (Player) %s PICKED ENTITY %s", "SOULSTONE", event.entityPlayer.getCommandSenderName(), event.target)); @@ -140,7 +140,7 @@ public class ServerEventsHandler { } @SubscribeEvent - public void invoke(LivingAttackEvent event) { + public void partyDamagedEvent(LivingAttackEvent event) { if(!(event.source != null && event.source.getEntity() instanceof EntityPlayer) || !(event.entityLiving instanceof EntityPlayer) || FMLCommonHandler.instance().getEffectiveSide().isClient()) return; @@ -457,7 +457,7 @@ public class ServerEventsHandler { PartyController.Instance().pingPartyQuestObjectiveUpdate(party); PartyController.Instance().checkQuestCompletion(party, EnumQuestType.Kill); } - + @SubscribeEvent public void world(PlayerEvent.SaveToFile event){ PlayerData data = PlayerDataController.Instance.getPlayerData((EntityPlayer) event.entity);