From a17977675a3115094151ab5440a117846f766e88 Mon Sep 17 00:00:00 2001 From: Kam Date: Sat, 2 Mar 2024 23:50:42 -0500 Subject: [PATCH] Fix Recursive AreaKill Quest Party Loop --- src/main/java/noppes/npcs/ServerEventsHandler.java | 6 +++++- src/main/java/noppes/npcs/controllers/data/Party.java | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/noppes/npcs/ServerEventsHandler.java b/src/main/java/noppes/npcs/ServerEventsHandler.java index d3b25138d..904c54838 100644 --- a/src/main/java/noppes/npcs/ServerEventsHandler.java +++ b/src/main/java/noppes/npcs/ServerEventsHandler.java @@ -345,7 +345,11 @@ public class ServerEventsHandler { List list = player.worldObj.getEntitiesWithinAABB(EntityPlayer.class, entity.boundingBox.expand(10, 10, 10)); for (EntityPlayer pl : list) { if (pl != player) { - doQuest(pl, entity, false); + if(party == null){ + doQuest(pl, entity, false); + } else if(!party.hasPlayer(pl.getUniqueID())){ + doQuest(pl, entity, false); + } } } } diff --git a/src/main/java/noppes/npcs/controllers/data/Party.java b/src/main/java/noppes/npcs/controllers/data/Party.java index 4f9408b4c..a1fea81f6 100644 --- a/src/main/java/noppes/npcs/controllers/data/Party.java +++ b/src/main/java/noppes/npcs/controllers/data/Party.java @@ -141,6 +141,10 @@ public class Party { return partyMembers.containsKey(player.getUniqueID()); } + public boolean hasPlayer(UUID uuid) { + return partyMembers.containsKey(uuid); + } + public boolean hasPlayer(String playerName) { UUID uuid = getUUID(playerName); if (uuid == null){