diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java b/src/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java index fdbf05ad..ec325bb1 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java @@ -35,7 +35,7 @@ public class CmdFactionsAccessPlayer extends CmdFactionsAccessAbstract public void innerPerform() { // Args - UPlayer uplayer = this.arg(0, ARUPlayer.getStartAny(usender)); + UPlayer uplayer = this.arg(0, ARUPlayer.getAny(usender)); if (uplayer == null) return; Boolean newValue = this.arg(1, ARBoolean.get(), !ta.isPlayerIdGranted(uplayer.getId())); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsDemote.java b/src/com/massivecraft/factions/cmd/CmdFactionsDemote.java index e3ccb5eb..099018f7 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsDemote.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsDemote.java @@ -37,7 +37,7 @@ public class CmdFactionsDemote extends FCommand @Override public void perform() { - UPlayer you = this.arg(0, ARUPlayer.getStartAny(usender)); + UPlayer you = this.arg(0, ARUPlayer.getAny(usender)); if (you == null) return; if (you.getFaction() != usenderFaction) diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsInvite.java b/src/com/massivecraft/factions/cmd/CmdFactionsInvite.java index ee9b6c93..630c7bf8 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsInvite.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsInvite.java @@ -42,7 +42,7 @@ public class CmdFactionsInvite extends FCommand public void perform() { // Args - UPlayer uplayer = this.arg(0, ARUPlayer.getStartAny(sender)); + UPlayer uplayer = this.arg(0, ARUPlayer.getAny(sender)); if (uplayer == null) return; Boolean newInvited = this.arg(1, ARBoolean.get(), !usenderFaction.isInvited(uplayer)); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java b/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java index bc154d95..0a3e46e5 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java @@ -45,7 +45,7 @@ public class CmdFactionsJoin extends FCommand Faction faction = this.arg(0, ARFaction.get(sender)); if (faction == null) return; - UPlayer uplayer = this.arg(1, ARUPlayer.getStartAny(sender), usender); + UPlayer uplayer = this.arg(1, ARUPlayer.getAny(sender), usender); if (uplayer == null) return; Faction uplayerFaction = uplayer.getFaction(); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsKick.java b/src/com/massivecraft/factions/cmd/CmdFactionsKick.java index a1c6f955..0f33a605 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsKick.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsKick.java @@ -43,7 +43,7 @@ public class CmdFactionsKick extends FCommand public void perform() { // Arg - UPlayer uplayer = this.arg(0, ARUPlayer.getStartAny(sender)); + UPlayer uplayer = this.arg(0, ARUPlayer.getAny(sender)); if (uplayer == null) return; // Validate diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsLeader.java b/src/com/massivecraft/factions/cmd/CmdFactionsLeader.java index b94d4752..16ba5ccf 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsLeader.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsLeader.java @@ -40,7 +40,7 @@ public class CmdFactionsLeader extends FCommand @Override public void perform() { - UPlayer newLeader = this.arg(0, ARUPlayer.getStartAny(sender)); + UPlayer newLeader = this.arg(0, ARUPlayer.getAny(sender)); if (newLeader == null) return; Faction targetFaction = this.arg(1, ARFaction.get(sender), usenderFaction); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java index 4d7ca199..52c7d45a 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java @@ -53,7 +53,7 @@ public class CmdFactionsMoneyTransferFp extends FCommand Faction from = this.arg(1, ARFaction.get(sender)); if (from == null) return; - UPlayer to = this.arg(2, ARUPlayer.getStartAny(sender)); + UPlayer to = this.arg(2, ARUPlayer.getAny(sender)); if (to == null) return; boolean success = Econ.transferMoney(usender, from, to, amount); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java index 6a13e263..3e146d7d 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java @@ -50,7 +50,7 @@ public class CmdFactionsMoneyTransferPf extends FCommand Double amount = this.arg(0, ARDouble.get()); if (amount == null) return; - UPlayer from = this.arg(1, ARUPlayer.getStartAny(sender)); + UPlayer from = this.arg(1, ARUPlayer.getAny(sender)); if (from == null) return; Faction to = this.arg(2, ARFaction.get(sender)); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsOfficer.java b/src/com/massivecraft/factions/cmd/CmdFactionsOfficer.java index e4cada08..393aac15 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsOfficer.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsOfficer.java @@ -34,7 +34,7 @@ public class CmdFactionsOfficer extends FCommand @Override public void perform() { - UPlayer you = this.arg(0, ARUPlayer.getStartAny(sender)); + UPlayer you = this.arg(0, ARUPlayer.getAny(sender)); if (you == null) return; boolean permAny = Perm.OFFICER_ANY.has(sender, false); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPlayer.java b/src/com/massivecraft/factions/cmd/CmdFactionsPlayer.java index 96876bab..d039b11b 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPlayer.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPlayer.java @@ -39,7 +39,7 @@ public class CmdFactionsPlayer extends FCommand public void perform() { // Args - UPlayer uplayer = this.arg(0, ARUPlayer.getStartAny(sender), usender); + UPlayer uplayer = this.arg(0, ARUPlayer.getAny(sender), usender); if (uplayer == null) return; // INFO: Title diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java b/src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java index b9d1b2cc..26b4e2a3 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java @@ -58,7 +58,7 @@ public class CmdFactionsPowerBoost extends FCommand if (doPlayer) { - UPlayer targetPlayer = this.arg(1, ARUPlayer.getStartAny(sender)); + UPlayer targetPlayer = this.arg(1, ARUPlayer.getAny(sender)); if (targetPlayer == null) return; targetPlayer.setPowerBoost(targetPower); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPromote.java b/src/com/massivecraft/factions/cmd/CmdFactionsPromote.java index 4915fd7d..04df2da7 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPromote.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPromote.java @@ -37,7 +37,7 @@ public class CmdFactionsPromote extends FCommand @Override public void perform() { - UPlayer you = this.arg(0, ARUPlayer.getStartAny(sender)); + UPlayer you = this.arg(0, ARUPlayer.getAny(sender)); if (you == null) return; if (you.getFaction() != usenderFaction) diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsTitle.java b/src/com/massivecraft/factions/cmd/CmdFactionsTitle.java index 20712971..b209c682 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsTitle.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsTitle.java @@ -42,7 +42,7 @@ public class CmdFactionsTitle extends FCommand public void perform() { // Args - UPlayer you = this.arg(0, ARUPlayer.getStartAny(sender)); + UPlayer you = this.arg(0, ARUPlayer.getAny(sender)); if (you == null) return; String newTitle = this.argConcatFrom(1, ARString.get(), ""); diff --git a/src/com/massivecraft/factions/cmd/arg/ARUPlayer.java b/src/com/massivecraft/factions/cmd/arg/ARUPlayer.java index ac4b5da6..1b67ba0c 100644 --- a/src/com/massivecraft/factions/cmd/arg/ARUPlayer.java +++ b/src/com/massivecraft/factions/cmd/arg/ARUPlayer.java @@ -2,7 +2,6 @@ package com.massivecraft.factions.cmd.arg; import com.massivecraft.factions.entity.UPlayer; import com.massivecraft.factions.entity.UPlayerColls; -import com.massivecraft.massivecore.cmd.arg.ARSenderEntity; import com.massivecraft.massivecore.cmd.arg.ArgReader; public class ARUPlayer @@ -11,12 +10,8 @@ public class ARUPlayer // INSTANCE // -------------------------------------------- // - public static ArgReader getFullAny(Object o) { return ARSenderEntity.getFullAny(UPlayerColls.get().get(o)); } + public static ArgReader getAny(Object o) { return UPlayerColls.get().get(o).getAREntity(); } - public static ArgReader getStartAny(Object o) { return ARSenderEntity.getStartAny(UPlayerColls.get().get(o)); } - - public static ArgReader getFullOnline(Object o) { return ARSenderEntity.getFullOnline(UPlayerColls.get().get(o)); } - - public static ArgReader getStartOnline(Object o) { return ARSenderEntity.getStartOnline(UPlayerColls.get().get(o)); } + public static ArgReader getOnline(Object o) { return UPlayerColls.get().get(o).getAREntity(true); } }