More Type Security

This commit is contained in:
Olof Larsson
2015-05-16 14:30:49 +02:00
parent a9b80dacfe
commit b244ff63c7
11 changed files with 49 additions and 31 deletions

View File

@@ -26,7 +26,8 @@ public class ReqHasFaction extends ReqAbstract
@Override
public boolean apply(CommandSender sender, MassiveCommand command)
{
if (MUtil.isNpc(sender)) return false;
if (MUtil.isntSender(sender)) return false;
MPlayer mplayer = MPlayer.get(sender);
return mplayer.hasFaction();
}

View File

@@ -26,7 +26,8 @@ public class ReqHasntFaction extends ReqAbstract
@Override
public boolean apply(CommandSender sender, MassiveCommand command)
{
if (MUtil.isNpc(sender)) return true;
if (MUtil.isntSender(sender)) return true;
MPlayer mplayer = MPlayer.get(sender);
return !mplayer.hasFaction();
}

View File

@@ -34,7 +34,8 @@ public class ReqRoleIsAtLeast extends ReqAbstract
@Override
public boolean apply(CommandSender sender, MassiveCommand command)
{
if (MUtil.isNpc(sender)) return false;
if (MUtil.isntSender(sender)) return false;
MPlayer mplayer = MPlayer.get(sender);
return mplayer.getRole().isAtLeast(this.rel);
}