From 0ac9747df1f8b64aa18f6cc961f514bcb639f15a Mon Sep 17 00:00:00 2001 From: Ben Date: Sun, 10 Apr 2016 15:27:20 +0100 Subject: [PATCH] Modifying how the Meridian Scepter picks a target, as the previous logic was a bit flawed. --- .../game/clans/items/legendaries/MeridianScepter.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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; }