upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-11 21:57:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Animals with Soulstones Requiring NPC Interaction

Browse Source
This commit is contained in:
Kam committed 2024-05-24 16:56:56 -04:00
1 parent 4df2866fb0
commit 6c9a21d459
1 file changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/noppes/npcs/ServerEventsHandler.java
+3 -3
View File
@@ -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);