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