Fix #87 by always checking whether Essentials is null

Realizedd · Apr 9, 2023 · 53963a4 · 53963a4
1 parent e18edb5
commit 53963a4
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/duels-plugin/src/main/java/me/realized/duels/spectate/SpectateManagerImpl.java b/duels-plugin/src/main/java/me/realized/duels/spectate/SpectateManagerImpl.java
@@ -65,8 +65,8 @@ public class SpectateManagerImpl implements Loadable, SpectateManager {
     private final Multimap<Arena, SpectatorImpl> arenas = HashMultimap.create();
 
     private Teleport teleport;
-    private MyPetHook myPet;
-    private EssentialsHook essentials;
+    @Nullable private MyPetHook myPet;
+    @Nullable private EssentialsHook essentials;
 
     public SpectateManagerImpl(final DuelsPlugin plugin) {
         this.plugin = plugin;
@@ -139,15 +139,17 @@ public Result startSpectating(@NotNull final Player player, @NotNull final Playe
         final MatchImpl match = arena.getMatch();
 
         // Hide from players in match
-        if (match != null && !essentials.isVanished(player)) {
+        if (match != null) {
             match.getAllPlayers()
                 .stream()
                 .filter(arenaPlayer -> arenaPlayer.isOnline() && arenaPlayer.canSee(player))
                 .forEach(arenaPlayer -> {
                     if (CompatUtil.hasHidePlayer()) {
                         arenaPlayer.hidePlayer(plugin, player);
                     } else {
-                        arenaPlayer.hidePlayer(player);
+                        if (essentials == null || !essentials.isVanished(player)) {
+                            arenaPlayer.hidePlayer(player);
+                        }
                     }
                 });
         }
@@ -224,15 +226,17 @@ public void stopSpectating(final Player player, final SpectatorImpl spectator) {
         final MatchImpl match = spectator.getArena().getMatch();
 
         // Show to players in match
-        if (match != null && !essentials.isVanished(player)) {
+        if (match != null) {
             match.getAllPlayers()
                 .stream()
                 .filter(Player::isOnline)
                 .forEach(arenaPlayer -> {
                     if (CompatUtil.hasHidePlayer()) {
                         arenaPlayer.showPlayer(plugin, player);
                     } else {
-                        arenaPlayer.showPlayer(player);
+                        if (essentials == null || !essentials.isVanished(player)) {
+                            arenaPlayer.showPlayer(player);
+                        }
                     }
                 });
         }