Do not track player if the pre-track event was cancelled (#119)

juliarn · Feb 28, 2024 · 36e6dc6 · 36e6dc6
1 parent cb63472
commit 36e6dc6
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/common/src/main/java/com/github/juliarn/npclib/common/npc/CommonNpc.java b/common/src/main/java/com/github/juliarn/npclib/common/npc/CommonNpc.java
@@ -183,12 +183,15 @@ public boolean tracksPlayer(@NotNull P player) {
   @Override
   public @NotNull Npc<W, P, I, E> forceTrackPlayer(@NotNull P player) {
     // check if the player is not already tracked
-    if (this.trackedPlayers.add(player)) {
+    if (!this.trackedPlayers.contains(player)) {
       // break early if the add is not wanted by plugin
       if (this.platform.eventManager().post(DefaultShowNpcEvent.pre(this, player)).cancelled()) {
         return this;
       }
 
+      // add the player
+      this.trackedPlayers.add(player);
+
       // send the player info packet
       this.platform.packetFactory().createPlayerInfoPacket(PlayerInfoAction.ADD_PLAYER).schedule(player, this);