diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/MeridianScepter.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/MeridianScepter.java index ce2999b4d..2311cc8ec 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/MeridianScepter.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/MeridianScepter.java @@ -151,7 +151,7 @@ public class MeridianScepter extends LegendaryItem continue; } - if (ClansManager.getInstance().getClan(shooter) == ClansManager.getInstance().getClan(closest)) + if (ClansManager.getInstance().isInClan(shooter) && ClansManager.getInstance().getClan(shooter).isMember(closest)) { continue; } @@ -161,12 +161,17 @@ public class MeridianScepter extends LegendaryItem continue; } + if (closest.getGameMode().equals(GameMode.CREATIVE) || closest.getGameMode().equals(GameMode.SPECTATOR)) + { + continue; + } + if (ClansManager.getInstance().getIncognitoManager().Get(closest).Status) { continue; } - if (ClansManager.getInstance().getClan(shooter) != null && ClansManager.getInstance().getClan(shooter).isAlly(ClansManager.getInstance().getClan(closest))) + if (ClansManager.getInstance().isInClan(shooter) && ClansManager.getInstance().getClan(shooter).isAlly(ClansManager.getInstance().getClan(closest))) { continue; }