fix npc

boiscljo · Apr 20, 2022 · a71cb9d · a71cb9d
1 parent c366fab
commit a71cb9d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/plugin/src/main/java/io/github/pronze/sba/commands/GamesInvNPCCommand.java b/plugin/src/main/java/io/github/pronze/sba/commands/GamesInvNPCCommand.java
@@ -41,7 +41,7 @@ private void commandSpawn(final @NotNull Player player,
         }*/
 
         GamesInventoryService.getInstance().addNPC(mode, player.getLocation());
-        GamesInventoryService.getInstance().addViewer(PlayerMapper.wrapPlayer(player));
+        GamesInventoryService.getInstance().addViewer(player);
         LanguageService
                 .getInstance()
                 .get(MessageKeys.ADDED_NPC)

diff --git a/plugin/src/main/java/io/github/pronze/sba/service/GamesInventoryService.java b/plugin/src/main/java/io/github/pronze/sba/service/GamesInventoryService.java
@@ -120,9 +120,7 @@ public void loadGamesInv() {
             update();
         }
         Tasker.build(() -> Bukkit.getOnlinePlayers().forEach(player -> {
-            if (MainLobbyVisualsManager.isInWorld(player.getLocation())) {
-                addViewer(PlayerMapper.wrapPlayer(player));
-            }
+            addViewer(player);
         })).delay(1L, TaskerTime.SECONDS).start();
     }
 
@@ -231,17 +229,19 @@ public void update() {
         }
     }
 
-    public void addViewer(@NotNull PlayerWrapper player) {
+    public void addViewer(@NotNull Player player) {
+        removeViewer(player);
         Logger.trace("addViewer", player.getName());
 
         NPCs.forEach(npc -> {
             Logger.trace("npc::addViewer", player.getName());
-            npc.npc.addViewer(player);
+            if (npc.location.getWorld().equals(player.getWorld()))
+                npc.npc.addViewer(PlayerMapper.wrapPlayer(player));
         });
     }
 
-    public void removeViewer(@NotNull PlayerWrapper player) {
-        NPCs.forEach(npc -> npc.npc.removeViewer(player));
+    public void removeViewer(@NotNull Player player) {
+        NPCs.forEach(npc -> npc.npc.removeViewer(PlayerMapper.wrapPlayer(player)));
     }
 
     @OnPreDisable
@@ -259,7 +259,7 @@ public void onPlayerJoin(PlayerJoinEvent e) {
         final var player = e.getPlayer();
         Tasker.build(() -> {
             if (player.isOnline()) {
-                addViewer(PlayerMapper.wrapPlayer(player));
+                addViewer(player);
             }
         }).delay(1L, TaskerTime.TICKS).start();
     }
@@ -269,7 +269,7 @@ public void onPlayerChangeWorld(PlayerChangedWorldEvent e) {
         final var player = e.getPlayer();
         Tasker.build(() -> {
             if (player.isOnline()) {
-                addViewer(PlayerMapper.wrapPlayer(player));
+                addViewer(player);
             }
         }).delay(1L, TaskerTime.TICKS).start();
     }