JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modifying how the Meridian Scepter picks a target, as the previous logic was a bit flawed.

Browse Source
This commit is contained in:
Ben 2016-04-10 15:27:20 +01:00
parent 9a2f4a8936
commit 0ac9747df1
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/MeridianScepter.java
View File

@ -151,7 +151,7 @@ public class MeridianScepter extends LegendaryItem
continue; continue;
} }
if (ClansManager.getInstance().getClan(shooter) == ClansManager.getInstance().getClan(closest)) if (ClansManager.getInstance().isInClan(shooter) && ClansManager.getInstance().getClan(shooter).isMember(closest))
{ {
continue; continue;
} }
@ -161,12 +161,17 @@ public class MeridianScepter extends LegendaryItem
continue; continue;
} }
if (closest.getGameMode().equals(GameMode.CREATIVE) || closest.getGameMode().equals(GameMode.SPECTATOR))
{
continue;
}
if (ClansManager.getInstance().getIncognitoManager().Get(closest).Status) if (ClansManager.getInstance().getIncognitoManager().Get(closest).Status)
{ {
continue; 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; continue;
} }