Fix friendly villagers can see Spectators

MetallicGoat · May 22, 2023 · 3f66253 · 3f66253
1 parent aa629c4
commit 3f66253
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/main/java/me/metallicgoat/tweaksaddon/config/SwordsToolsConfig.java b/src/main/java/me/metallicgoat/tweaksaddon/config/SwordsToolsConfig.java
@@ -62,7 +62,7 @@ public class SwordsToolsConfig {
       }
   )
   public static boolean always_sword_chest_enabled = false;
-  @Config public static boolean always_sword_drop_enabled = true;
+  @Config public static boolean always_sword_drop_enabled = false;
 
   @Config(
       description = {

diff --git a/src/main/java/me/metallicgoat/tweaksaddon/tweaks/cosmetic/FriendlyVillagers.java b/src/main/java/me/metallicgoat/tweaksaddon/tweaks/cosmetic/FriendlyVillagers.java
@@ -1,6 +1,7 @@
 package me.metallicgoat.tweaksaddon.tweaks.cosmetic;
 
 import de.marcely.bedwars.api.BedwarsAPI;
+import de.marcely.bedwars.api.GameAPI;
 import de.marcely.bedwars.api.event.arena.RoundEndEvent;
 import de.marcely.bedwars.api.event.arena.RoundStartEvent;
 import de.marcely.bedwars.api.world.WorldStorage;
@@ -96,10 +97,14 @@ private void startLooking() {
 
           // Get players in range of villager
           final List<Player> visiblePlayers = new ArrayList<>();
+
           for (Player player : hologramEntity.getSeeingPlayers()) {
 
             // Check for same world & within range
-            if (player.getWorld() != hologramEntity.getWorld().asBukkit() || player.getLocation().distance(hologramEntity.getLocation()) > MainConfig.friendly_villagers_range)
+            if (player.getWorld() != hologramEntity.getWorld().asBukkit() ||
+                    GameAPI.get().getArenaByPlayer(player) == null ||
+                    GameAPI.get().getSpectatingPlayers().contains(player) ||
+                    player.getLocation().distance(hologramEntity.getLocation()) > MainConfig.friendly_villagers_range)
               continue;
 
             // Check if villager can even see player