MassiveCore Change - ArgReaders use Exceptions

MassiveCraft · Feb 4, 2015 · 8322528 · 8322528
1 parent 8c27fe6
commit 8322528
Show file tree

Hide file tree

Showing 44 changed files with 103 additions and 133 deletions.
diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java b/src/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java
@@ -8,6 +8,7 @@
 import com.massivecraft.factions.TerritoryAccess;
 import com.massivecraft.factions.entity.BoardColl;
 import com.massivecraft.factions.entity.Faction;
+import com.massivecraft.massivecore.cmd.MassiveCommandException;
 import com.massivecraft.massivecore.cmd.req.ReqIsPlayer;
 import com.massivecraft.massivecore.ps.PS;
 import com.massivecraft.massivecore.ps.PSFormatHumanSpace;
@@ -39,7 +40,7 @@ public CmdFactionsAccessAbstract()
 	// -------------------------------------------- //
 
 	@Override
-	public void perform()
+	public void perform() throws MassiveCommandException
 	{
 		chunk = PS.valueOf(me.getLocation()).getChunk(true);
 		ta = BoardColl.get().getTerritoryAccessAt(chunk);
@@ -48,7 +49,7 @@ public void perform()
 		this.innerPerform();
 	}
 
-	public abstract void innerPerform();
+	public abstract void innerPerform() throws MassiveCommandException;
 
 	public void sendAccessInfo()
 	{

diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAccessFaction.java b/src/com/massivecraft/factions/cmd/CmdFactionsAccessFaction.java
@@ -5,6 +5,7 @@
 import com.massivecraft.factions.entity.BoardColl;
 import com.massivecraft.factions.entity.Faction;
 import com.massivecraft.factions.entity.MPerm;
+import com.massivecraft.massivecore.cmd.MassiveCommandException;
 import com.massivecraft.massivecore.cmd.arg.ARBoolean;
 import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
 
@@ -32,14 +33,11 @@ public CmdFactionsAccessFaction()
 	// -------------------------------------------- //
 
 	@Override
-	public void innerPerform()
+	public void innerPerform() throws MassiveCommandException
 	{
 		// Args
 		Faction faction = this.arg(0, ARFaction.get());
-		if (faction == null) return;
-
 		Boolean newValue = this.arg(1, ARBoolean.get(), !ta.isFactionIdGranted(faction.getId()));
-		if (newValue == null) return;
 
 		// MPerm
 		if (!MPerm.getPermAccess().has(msender, hostFaction, true)) return;

diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java b/src/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java
@@ -5,6 +5,7 @@
 import com.massivecraft.factions.entity.BoardColl;
 import com.massivecraft.factions.entity.MPerm;
 import com.massivecraft.factions.entity.MPlayer;
+import com.massivecraft.massivecore.cmd.MassiveCommandException;
 import com.massivecraft.massivecore.cmd.arg.ARBoolean;
 import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
 
@@ -32,14 +33,11 @@ public CmdFactionsAccessPlayer()
 	// -------------------------------------------- //
 
 	@Override
-	public void innerPerform()
+	public void innerPerform() throws MassiveCommandException
 	{
 		// Args
 		MPlayer mplayer = this.arg(0, ARMPlayer.getAny());
-		if (mplayer == null) return;
-
 		Boolean newValue = this.arg(1, ARBoolean.get(), !ta.isPlayerIdGranted(mplayer.getId()));
-		if (newValue == null) return;
 
 		// MPerm
 		if (!MPerm.getPermAccess().has(msender, hostFaction, true)) return;

diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAdmin.java b/src/com/massivecraft/factions/cmd/CmdFactionsAdmin.java
@@ -2,6 +2,7 @@
 
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.Perm;
+import com.massivecraft.massivecore.cmd.MassiveCommandException;
 import com.massivecraft.massivecore.cmd.arg.ARBoolean;
 import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
 import com.massivecraft.massivecore.util.IdUtil;
@@ -30,11 +31,10 @@ public CmdFactionsAdmin()
 	// -------------------------------------------- //
 
 	@Override
-	public void perform()
+	public void perform() throws MassiveCommandException
 	{
 		// Args
 		Boolean target = this.arg(0, ARBoolean.get(), !msender.isUsingAdminMode());
-		if (target == null) return;
 
 		// Apply
 		msender.setUsingAdminMode(target);		

diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsDisband.java b/src/com/massivecraft/factions/cmd/CmdFactionsDisband.java
@@ -12,6 +12,7 @@
 import com.massivecraft.factions.event.EventFactionsMembershipChange.MembershipChangeReason;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.Perm;
+import com.massivecraft.massivecore.cmd.MassiveCommandException;
 import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
 import com.massivecraft.massivecore.util.IdUtil;
 import com.massivecraft.massivecore.util.Txt;
@@ -39,11 +40,10 @@ public CmdFactionsDisband()
 	// -------------------------------------------- //
 
 	@Override
-	public void perform()
+	public void perform() throws MassiveCommandException
 	{
 		// Args
 		Faction faction = this.arg(0, ARFaction.get(), msenderFaction);
-		if (faction == null) return;
 
 		// MPerm
 		if ( ! MPerm.getPermDisband().has(msender, faction, true)) return;

diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsFaction.java b/src/com/massivecraft/factions/cmd/CmdFactionsFaction.java
@@ -11,6 +11,7 @@
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.massivecore.PriorityLines;
+import com.massivecraft.massivecore.cmd.MassiveCommandException;
 import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
 import com.massivecraft.massivecore.mixin.Mixin;
 import com.massivecraft.massivecore.util.Txt;
@@ -38,11 +39,10 @@ public CmdFactionsFaction()
 	// -------------------------------------------- //
 
 	@Override
-	public void perform()
+	public void perform() throws MassiveCommandException
 	{
 		// Args
 		final Faction faction = this.arg(0, ARFaction.get(), msenderFaction);
-		if (faction == null) return;
 
 		final CommandSender sender = this.sender;
 

diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsFlagList.java b/src/com/massivecraft/factions/cmd/CmdFactionsFlagList.java
@@ -5,6 +5,7 @@
 
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.entity.MFlag;
+import com.massivecraft.massivecore.cmd.MassiveCommandException;
 import com.massivecraft.massivecore.cmd.arg.ARInteger;
 import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
 import com.massivecraft.massivecore.util.Txt;
@@ -32,11 +33,10 @@ public CmdFactionsFlagList()
 	// -------------------------------------------- //
 
 	@Override
-	public void perform()
+	public void perform() throws MassiveCommandException
 	{
 		// Args
 		Integer pageHumanBased = this.arg(0, ARInteger.get(), 1);
-		if (pageHumanBased == null) return;
 
 		//Create messages
 		List<String> messages = new ArrayList<String>();

diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsFlagSet.java b/src/com/massivecraft/factions/cmd/CmdFactionsFlagSet.java
@@ -7,6 +7,7 @@
 import com.massivecraft.factions.entity.MFlag;
 import com.massivecraft.factions.entity.MPerm;
 import com.massivecraft.factions.event.EventFactionsFlagChange;
+import com.massivecraft.massivecore.cmd.MassiveCommandException;
 import com.massivecraft.massivecore.cmd.arg.ARBoolean;
 import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
 
@@ -35,15 +36,12 @@ public CmdFactionsFlagSet()
 	// -------------------------------------------- //
 
 	@Override
-	public void perform()
+	public void perform() throws MassiveCommandException
 	{
 		// Args
 		MFlag flag = this.arg(0, ARMFlag.get());
-		if (flag == null) return;
 		Boolean value = this.arg(1, ARBoolean.get());
-		if (value == null) return;
 		Faction faction = this.arg(2, ARFaction.get(), msenderFaction);
-		if (faction == null) return;
 
 		// Do the sender have the right to change flags for this faction?
 		if ( ! MPerm.getPermFlags().has(msender, faction, true)) return;

diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsFlagShow.java b/src/com/massivecraft/factions/cmd/CmdFactionsFlagShow.java
@@ -8,6 +8,7 @@
 import com.massivecraft.factions.cmd.arg.ARMFlag;
 import com.massivecraft.factions.entity.Faction;
 import com.massivecraft.factions.entity.MFlag;
+import com.massivecraft.massivecore.cmd.MassiveCommandException;
 import com.massivecraft.massivecore.cmd.arg.ARList;
 import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
 import com.massivecraft.massivecore.util.Txt;
@@ -37,11 +38,10 @@ public CmdFactionsFlagShow()
 	// -------------------------------------------- //
 
 	@Override
-	public void perform()
+	public void perform() throws MassiveCommandException
 	{
 		// Arg: Faction
 		Faction faction = this.arg(0, ARFaction.get(), msenderFaction);
-		if (faction == null) return;
 
 		List<MFlag> flags = new ArrayList<MFlag>();
 
@@ -58,7 +58,6 @@ public void perform()
 		{
 			// Arg: MFlag. Maybe we should use ARSet but that is currently buggy.
 			List<MFlag> mflags = this.arg(this.argConcatFrom(1), ARList.get(ARMFlag.get()));
-			if (mflags == null) return;
 			flags.addAll(mflags);
 		}
 

diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsHome.java b/src/com/massivecraft/factions/cmd/CmdFactionsHome.java
@@ -15,6 +15,7 @@
 import com.massivecraft.factions.entity.MPlayer;
 import com.massivecraft.factions.entity.Faction;
 import com.massivecraft.factions.event.EventFactionsHomeTeleport;
+import com.massivecraft.massivecore.cmd.MassiveCommandException;
 import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
 import com.massivecraft.massivecore.cmd.req.ReqIsPlayer;
 import com.massivecraft.massivecore.mixin.Mixin;
@@ -46,7 +47,7 @@ public CmdFactionsHome()
 	// -------------------------------------------- //
 
 	@Override
-	public void perform()
+	public void perform() throws MassiveCommandException
 	{
 		if ( ! MConf.get().homesTeleportCommandEnabled)
 		{
@@ -56,7 +57,6 @@ public void perform()
 
 		// Args
 		Faction faction = this.arg(0, ARFaction.get(), msenderFaction);
-		if (faction == null) return;
 		PS home = faction.getHome();
 		String homeDesc = "home for " + faction.describeTo(msender, false);
 

diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java b/src/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java
@@ -8,6 +8,7 @@
 import com.massivecraft.factions.entity.MPerm;
 import com.massivecraft.factions.entity.MPlayer;
 import com.massivecraft.factions.event.EventFactionsInvitedChange;
+import com.massivecraft.massivecore.cmd.MassiveCommandException;
 import com.massivecraft.massivecore.cmd.arg.ARSet;
 import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
 
@@ -34,11 +35,10 @@ public CmdFactionsInviteAdd()
 	// -------------------------------------------- //	
 
 	@Override
-	public void perform()
+	public void perform() throws MassiveCommandException
 	{
 		// Args
 		Set<MPlayer> mplayers = this.argConcatFrom(0, ARSet.get(ARMPlayer.getAny(), true));
-		if (mplayers == null) return;
 
 		// MPerm
 		if ( ! MPerm.getPermInvite().has(msender, msenderFaction, true)) return;

diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsInviteList.java b/src/com/massivecraft/factions/cmd/CmdFactionsInviteList.java
@@ -8,6 +8,7 @@
 import com.massivecraft.factions.entity.Faction;
 import com.massivecraft.factions.entity.MPerm;
 import com.massivecraft.factions.entity.MPlayer;
+import com.massivecraft.massivecore.cmd.MassiveCommandException;
 import com.massivecraft.massivecore.cmd.arg.ARInteger;
 import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
 import com.massivecraft.massivecore.pager.PagerSimple;
@@ -38,14 +39,12 @@ public CmdFactionsInviteList()
 	// -------------------------------------------- //	
 
 	@Override
-	public void perform()
+	public void perform() throws MassiveCommandException
 	{		
 		// Args	
 		Integer pageHumanBased = this.arg(0, ARInteger.get(), 1);
-		if (pageHumanBased == null) return;
 
 		Faction faction = this.arg(1, ARFaction.get(), msenderFaction);
-		if (faction == null) return;
 
 		if ( faction != msenderFaction && ! Perm.INVITE_LIST_OTHER.has(sender, true)) return;
 

diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java b/src/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java
@@ -10,6 +10,7 @@
 import com.massivecraft.factions.entity.MPerm;
 import com.massivecraft.factions.entity.MPlayer;
 import com.massivecraft.factions.event.EventFactionsInvitedChange;
+import com.massivecraft.massivecore.cmd.MassiveCommandException;
 import com.massivecraft.massivecore.cmd.arg.ARSet;
 import com.massivecraft.massivecore.cmd.arg.ARString;
 import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
@@ -37,7 +38,7 @@ public CmdFactionsInviteRemove()
 	// -------------------------------------------- //	
 
 	@Override
-	public void perform()
+	public void perform() throws MassiveCommandException
 	{
 		Set<MPlayer> mplayers = new HashSet<MPlayer>();
 		boolean all = false;
@@ -58,7 +59,6 @@ public void perform()
 		else
 		{
 			Set<MPlayer> senderInput = this.argConcatFrom(0, ARSet.get(ARMPlayer.getAny(), true));
-			if (senderInput == null) return;
 
 			mplayers.addAll(senderInput);
 		}

diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java b/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java
@@ -10,6 +10,7 @@
 import com.massivecraft.factions.entity.Faction;
 import com.massivecraft.factions.event.EventFactionsMembershipChange;
 import com.massivecraft.factions.event.EventFactionsMembershipChange.MembershipChangeReason;
+import com.massivecraft.massivecore.cmd.MassiveCommandException;
 import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
 import com.massivecraft.massivecore.util.Txt;
 
@@ -37,14 +38,12 @@ public CmdFactionsJoin()
 	// -------------------------------------------- //
 
 	@Override
-	public void perform()
+	public void perform() throws MassiveCommandException
 	{
 		// Args
-		Faction faction = this.arg(0, ARFaction.get());
-		if (faction == null) return;
+		Faction faction = this.arg(0, ARFaction.get());		
 
 		MPlayer mplayer = this.arg(1, ARMPlayer.getAny(), msender);
-		if (mplayer == null) return;
 		Faction mplayerFaction = mplayer.getFaction();
 
 		boolean samePlayer = mplayer == msender;

diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsKick.java b/src/com/massivecraft/factions/cmd/CmdFactionsKick.java
@@ -11,6 +11,7 @@
 import com.massivecraft.factions.entity.MConf;
 import com.massivecraft.factions.event.EventFactionsMembershipChange;
 import com.massivecraft.factions.event.EventFactionsMembershipChange.MembershipChangeReason;
+import com.massivecraft.massivecore.cmd.MassiveCommandException;
 import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
 import com.massivecraft.massivecore.util.IdUtil;
 
@@ -37,11 +38,10 @@ public CmdFactionsKick()
 	// -------------------------------------------- //
 
 	@Override
-	public void perform()
+	public void perform() throws MassiveCommandException
 	{
 		// Arg
 		MPlayer mplayer = this.arg(0, ARMPlayer.getAny());
-		if (mplayer == null) return;
 
 		// Validate
 		if (msender == mplayer)

diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsList.java b/src/com/massivecraft/factions/cmd/CmdFactionsList.java
@@ -10,6 +10,7 @@
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.entity.Faction;
 import com.massivecraft.factions.entity.FactionColl;
+import com.massivecraft.massivecore.cmd.MassiveCommandException;
 import com.massivecraft.massivecore.cmd.arg.ARInteger;
 import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
 import com.massivecraft.massivecore.mixin.Mixin;
@@ -40,11 +41,10 @@ public CmdFactionsList()
 	// -------------------------------------------- //
 
 	@Override
-	public void perform()
+	public void perform() throws MassiveCommandException
 	{
 		// Args
 		final Integer pageHumanBased = this.arg(0, ARInteger.get(), 1);
-		if (pageHumanBased == null) return;
 
 		// NOTE: The faction list is quite slow and mostly thread safe.
 		// We run it asynchronously to spare the primary server thread.

diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMap.java b/src/com/massivecraft/factions/cmd/CmdFactionsMap.java
@@ -7,6 +7,7 @@
 import com.massivecraft.factions.Const;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.entity.BoardColl;
+import com.massivecraft.massivecore.cmd.MassiveCommandException;
 import com.massivecraft.massivecore.cmd.arg.ARBoolean;
 import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
 import com.massivecraft.massivecore.cmd.req.ReqIsPlayer;
@@ -36,7 +37,7 @@ public CmdFactionsMap()
 	// -------------------------------------------- //
 
 	@Override
-	public void perform()
+	public void perform() throws MassiveCommandException
 	{
 		if ( ! this.argIsSet(0))
 		{