EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More Type Security

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/factions/cmd/CmdFactionsHome.java
View File

@@ -120,7 +120,7 @@ public class CmdFactionsHome extends FactionsCommandHome
for (Player p : me.getServer().getOnlinePlayers())
{
if (MUtil.isNpc(p)) continue;
if (MUtil.isntPlayer(p)) continue;
if (p == null || !p.isOnline() || p.isDead() || p == me || p.getWorld() != w)
continue;

3
src/com/massivecraft/factions/cmd/req/ReqHasFaction.java
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();
}

3
src/com/massivecraft/factions/cmd/req/ReqHasntFaction.java
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();
}

3
src/com/massivecraft/factions/cmd/req/ReqRoleIsAtLeast.java
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);
}