MassiveCore Change
This commit is contained in:
parent
b257b71b03
commit
4a18daf2d9
@ -21,7 +21,7 @@ public class CmdFactionsAccessPlayer extends CmdFactionsAccessAbstract
|
||||
this.addAliases("p", "player");
|
||||
|
||||
// Args
|
||||
this.addArg(ARMPlayer.getAny(), "player");
|
||||
this.addArg(ARMPlayer.get(), "player");
|
||||
this.addArg(ARBoolean.get(), "yes/no", "toggle");
|
||||
|
||||
// Requirements
|
||||
|
@ -23,7 +23,7 @@ public class CmdFactionsInviteAdd extends FactionsCommand
|
||||
this.addAliases("a", "add");
|
||||
|
||||
// Args
|
||||
this.addArg(ARSet.get(ARMPlayer.getAny(), true), "players", true);
|
||||
this.addArg(ARSet.get(ARMPlayer.get(), true), "players", true);
|
||||
|
||||
// Requirements
|
||||
this.addRequirements(ReqHasPerm.get(Perm.INVITE_ADD.node));
|
||||
|
@ -25,7 +25,7 @@ public class CmdFactionsInviteRemove extends FactionsCommand
|
||||
this.addAliases("r", "remove");
|
||||
|
||||
// Args
|
||||
this.addArg(ARSet.get(ARMPlayer.getAny(), true), "players/all", true);
|
||||
this.addArg(ARSet.get(ARMPlayer.get(), true), "players/all", true);
|
||||
|
||||
// Requirements
|
||||
this.addRequirements(ReqHasPerm.get(Perm.INVITE_REMOVE.node));
|
||||
|
@ -27,7 +27,7 @@ public class CmdFactionsJoin extends FactionsCommand
|
||||
|
||||
// Args
|
||||
this.addArg(ARFaction.get(), "faction");
|
||||
this.addArg(ARMPlayer.getAny(), "player", "you");
|
||||
this.addArg(ARMPlayer.get(), "player", "you");
|
||||
|
||||
// Requirements
|
||||
this.addRequirements(ReqHasPerm.get(Perm.JOIN.node));
|
||||
|
@ -27,7 +27,7 @@ public class CmdFactionsKick extends FactionsCommand
|
||||
this.addAliases("kick");
|
||||
|
||||
// Args
|
||||
this.addArg(ARMPlayer.getAny(), "player");
|
||||
this.addArg(ARMPlayer.get(), "player");
|
||||
|
||||
// Requirements
|
||||
this.addRequirements(ReqHasPerm.get(Perm.KICK.node));
|
||||
|
@ -32,7 +32,7 @@ public class CmdFactionsMoneyTransferFp extends FactionsCommand
|
||||
// Args
|
||||
this.addArg(ARDouble.get(), "amount");
|
||||
this.addArg(ARFaction.get(), "faction");
|
||||
this.addArg(ARMPlayer.getAny(), "player");
|
||||
this.addArg(ARMPlayer.get(), "player");
|
||||
|
||||
// Requirements
|
||||
this.addRequirements(ReqHasPerm.get(Perm.MONEY_F2P.node));
|
||||
|
@ -31,7 +31,7 @@ public class CmdFactionsMoneyTransferPf extends FactionsCommand
|
||||
|
||||
// Args
|
||||
this.addArg(ARDouble.get(), "amount");
|
||||
this.addArg(ARMPlayer.getAny(), "player");
|
||||
this.addArg(ARMPlayer.get(), "player");
|
||||
this.addArg(ARFaction.get(), "faction");
|
||||
|
||||
// Requirements
|
||||
|
@ -27,7 +27,7 @@ public class CmdFactionsPlayer extends FactionsCommand
|
||||
this.addAliases("p", "player");
|
||||
|
||||
// Args
|
||||
this.addArg(ARMPlayer.getAny(), "player", "you");
|
||||
this.addArg(ARMPlayer.get(), "player", "you");
|
||||
|
||||
// Requirements
|
||||
this.addRequirements(ReqHasPerm.get(Perm.PLAYER.node));
|
||||
|
@ -18,7 +18,7 @@ public class CmdFactionsPowerBoost extends FactionsCommand
|
||||
// FIELDS
|
||||
// -------------------------------------------- //
|
||||
|
||||
private ArgSetting<MPlayer> settingMplayer = new ArgSetting<MPlayer>(ARMPlayer.getAny(), "name");
|
||||
private ArgSetting<MPlayer> settingMplayer = new ArgSetting<MPlayer>(ARMPlayer.get(), "name");
|
||||
private ArgSetting<Faction> settingFaction = new ArgSetting<Faction>(ARFaction.get(), "name");
|
||||
|
||||
// -------------------------------------------- //
|
||||
|
@ -61,7 +61,7 @@ public class CmdFactionsRank extends FactionsCommand
|
||||
this.addAliases("rank");
|
||||
|
||||
// Args
|
||||
this.addArg(ARMPlayer.getAny(), "player");
|
||||
this.addArg(ARMPlayer.get(), "player");
|
||||
this.addArg(rankReader, "action", "show");
|
||||
this.addArg(ARFaction.get(), "faction", "their");
|
||||
|
||||
|
@ -27,7 +27,7 @@ public class CmdFactionsRankOld extends FactionsCommand
|
||||
this.addAliases(rankName);
|
||||
|
||||
// Args
|
||||
this.addArg(ARMPlayer.getAny(), "player");
|
||||
this.addArg(ARMPlayer.get(), "player");
|
||||
this.addArg(ARFaction.get(), "faction", "their");
|
||||
|
||||
// VisibilityMode
|
||||
|
@ -21,7 +21,7 @@ public class CmdFactionsSetpower extends FactionsCommand
|
||||
this.addAliases("sp", "setpower");
|
||||
|
||||
// Args
|
||||
this.addArg(ARMPlayer.getAny(), "player");
|
||||
this.addArg(ARMPlayer.get(), "player");
|
||||
this.addArg(ARDouble.get(), "power");
|
||||
|
||||
// Requirements
|
||||
|
@ -24,7 +24,7 @@ public class CmdFactionsTitle extends FactionsCommand
|
||||
this.addAliases("title");
|
||||
|
||||
// Args
|
||||
this.addArg(ARMPlayer.getAny(), "player");
|
||||
this.addArg(ARMPlayer.get(), "player");
|
||||
this.addArg(ARString.get(), "title", "", true);
|
||||
|
||||
// Requirements
|
||||
|
@ -10,14 +10,9 @@ public class ARMPlayer
|
||||
// INSTANCE
|
||||
// -------------------------------------------- //
|
||||
|
||||
public static AR<MPlayer> getAny()
|
||||
public static AR<MPlayer> get()
|
||||
{
|
||||
return MPlayerColl.get().getAREntity();
|
||||
}
|
||||
|
||||
public static AR<MPlayer> getOnline()
|
||||
{
|
||||
return MPlayerColl.get().getAREntity(true);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -1078,7 +1078,7 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
|
||||
List<CommandSender> ret = new ArrayList<CommandSender>();
|
||||
|
||||
// Fill Ret
|
||||
for (CommandSender sender : IdUtil.getOnlineSenders())
|
||||
for (CommandSender sender : IdUtil.getLocalSenders())
|
||||
{
|
||||
if (MUtil.isntSender(sender)) continue;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user