Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-06-26 06:24:42 +02:00
Code Issues Projects Releases Wiki Activity

MassiveCommandException --> Exception

Browse Source
This commit is contained in:
Olof Larsson 2015-02-12 12:00:55 +01:00
parent 8e13c1c13f
commit da5e1de456
46 changed files with 97 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java
View File

@ -8,7 +8,7 @@ import com.massivecraft.factions.RelationParticipator;
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.MassiveException;
import com.massivecraft.massivecore.cmd.req.ReqIsPlayer;
import com.massivecraft.massivecore.ps.PS;
import com.massivecraft.massivecore.ps.PSFormatHumanSpace;
@ -40,7 +40,7 @@ public abstract class CmdFactionsAccessAbstract extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
chunk = PS.valueOf(me.getLocation()).getChunk(true);
ta = BoardColl.get().getTerritoryAccessAt(chunk);
@ -49,7 +49,7 @@ public abstract class CmdFactionsAccessAbstract extends FactionsCommand
this.innerPerform();
}
public abstract void innerPerform() throws MassiveCommandException;
public abstract void innerPerform() throws MassiveException;
public void sendAccessInfo()
{

4
src/com/massivecraft/factions/cmd/CmdFactionsAccessFaction.java
View File

@ -5,7 +5,7 @@ import com.massivecraft.factions.cmd.arg.ARFaction;
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.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARBoolean;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
@ -33,7 +33,7 @@ public class CmdFactionsAccessFaction extends CmdFactionsAccessAbstract
// -------------------------------------------- //
@Override
public void innerPerform() throws MassiveCommandException
public void innerPerform() throws MassiveException
{
// Args
Faction faction = this.arg(0, ARFaction.get());

4
src/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java
View File

@ -5,7 +5,7 @@ import com.massivecraft.factions.cmd.arg.ARMPlayer;
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.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARBoolean;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
@ -33,7 +33,7 @@ public class CmdFactionsAccessPlayer extends CmdFactionsAccessAbstract
// -------------------------------------------- //
@Override
public void innerPerform() throws MassiveCommandException
public void innerPerform() throws MassiveException
{
// Args
MPlayer mplayer = this.arg(0, ARMPlayer.getAny());

4
src/com/massivecraft/factions/cmd/CmdFactionsAdmin.java
View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARBoolean;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.util.IdUtil;
@ -31,7 +31,7 @@ public class CmdFactionsAdmin extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Args
Boolean target = this.arg(0, ARBoolean.get(), !msender.isUsingAdminMode());

4
src/com/massivecraft/factions/cmd/CmdFactionsDisband.java
View File

@ -12,7 +12,7 @@ import com.massivecraft.factions.event.EventFactionsMembershipChange;
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.MassiveException;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.util.IdUtil;
import com.massivecraft.massivecore.util.Txt;
@ -40,7 +40,7 @@ public class CmdFactionsDisband extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Args
Faction faction = this.arg(0, ARFaction.get(), msenderFaction);

4
src/com/massivecraft/factions/cmd/CmdFactionsFaction.java
View File

@ -10,8 +10,8 @@ import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.event.EventFactionsFactionShowAsync;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.massivecore.MassiveException;
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;
@ -39,7 +39,7 @@ public class CmdFactionsFaction extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Args
final Faction faction = this.arg(0, ARFaction.get(), msenderFaction);

4
src/com/massivecraft/factions/cmd/CmdFactionsFlagList.java
View File

@ -5,7 +5,7 @@ import java.util.List;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.entity.MFlag;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARInteger;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.util.Txt;
@ -33,7 +33,7 @@ public class CmdFactionsFlagList extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Args
Integer pageHumanBased = this.arg(0, ARInteger.get(), 1);

4
src/com/massivecraft/factions/cmd/CmdFactionsFlagSet.java
View File

@ -7,7 +7,7 @@ import com.massivecraft.factions.entity.Faction;
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.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARBoolean;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
@ -36,7 +36,7 @@ public class CmdFactionsFlagSet extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Args
MFlag flag = this.arg(0, ARMFlag.get());

4
src/com/massivecraft/factions/cmd/CmdFactionsFlagShow.java
View File

@ -8,7 +8,7 @@ import com.massivecraft.factions.cmd.arg.ARFaction;
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.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARList;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.util.Txt;
@ -38,7 +38,7 @@ public class CmdFactionsFlagShow extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Arg: Faction
Faction faction = this.arg(0, ARFaction.get(), msenderFaction);

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

@ -15,7 +15,7 @@ import com.massivecraft.factions.entity.MPerm;
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.MassiveException;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.cmd.req.ReqIsPlayer;
import com.massivecraft.massivecore.mixin.Mixin;
@ -47,7 +47,7 @@ public class CmdFactionsHome extends FactionsCommandHome
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
if ( ! MConf.get().homesTeleportCommandEnabled)
{

4
src/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java
View File

@ -8,7 +8,7 @@ import com.massivecraft.factions.cmd.arg.ARMPlayer;
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.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARSet;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
@ -35,7 +35,7 @@ public class CmdFactionsInviteAdd extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Args
Set<MPlayer> mplayers = this.argConcatFrom(0, ARSet.get(ARMPlayer.getAny(), true));

4
src/com/massivecraft/factions/cmd/CmdFactionsInviteList.java
View File

@ -8,7 +8,7 @@ import com.massivecraft.factions.cmd.arg.ARFaction;
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.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARInteger;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.pager.PagerSimple;
@ -39,7 +39,7 @@ public class CmdFactionsInviteList extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Args
Integer pageHumanBased = this.arg(0, ARInteger.get(), 1);

4
src/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java
View File

@ -10,7 +10,7 @@ import com.massivecraft.factions.cmd.arg.ARMPlayer;
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.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARSet;
import com.massivecraft.massivecore.cmd.arg.ARString;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
@ -38,7 +38,7 @@ public class CmdFactionsInviteRemove extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
Set<MPlayer> mplayers = new HashSet<MPlayer>();
boolean all = false;

4
src/com/massivecraft/factions/cmd/CmdFactionsJoin.java
View File

@ -10,7 +10,7 @@ import com.massivecraft.factions.entity.MPlayer;
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.MassiveException;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.util.Txt;
@ -38,7 +38,7 @@ public class CmdFactionsJoin extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Args
Faction faction = this.arg(0, ARFaction.get());

4
src/com/massivecraft/factions/cmd/CmdFactionsKick.java
View File

@ -11,7 +11,7 @@ import com.massivecraft.factions.entity.Faction;
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.MassiveException;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.util.IdUtil;
@ -38,7 +38,7 @@ public class CmdFactionsKick extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Arg
MPlayer mplayer = this.arg(0, ARMPlayer.getAny());

4
src/com/massivecraft/factions/cmd/CmdFactionsList.java
View File

@ -10,7 +10,7 @@ import com.massivecraft.factions.Factions;
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.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARInteger;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.mixin.Mixin;
@ -41,7 +41,7 @@ public class CmdFactionsList extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Args
final Integer pageHumanBased = this.arg(0, ARInteger.get(), 1);

4
src/com/massivecraft/factions/cmd/CmdFactionsMap.java
View File

@ -7,7 +7,7 @@ import org.bukkit.Location;
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.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARBoolean;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.cmd.req.ReqIsPlayer;
@ -37,7 +37,7 @@ public class CmdFactionsMap extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
if ( ! this.argIsSet(0))
{

4
src/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java
View File

@ -5,7 +5,7 @@ import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.Perm;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
public class CmdFactionsMoneyBalance extends FactionsCommand
@ -32,7 +32,7 @@ public class CmdFactionsMoneyBalance extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
Faction faction = this.arg(0, ARFaction.get(), msenderFaction);

4
src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java
View File

@ -7,7 +7,7 @@ import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARDouble;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.money.Money;
@ -40,7 +40,7 @@ public class CmdFactionsMoneyDeposit extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
Double amount = this.arg(0, ARDouble.get());

4
src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java
View File

@ -7,7 +7,7 @@ import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARDouble;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.money.Money;
@ -42,7 +42,7 @@ public class CmdFactionsMoneyTransferFf extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
Double amount = this.arg(0, ARDouble.get());
Faction from = this.arg(1, ARFaction.get());

4
src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java
View File

@ -9,7 +9,7 @@ import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARDouble;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.money.Money;
@ -44,7 +44,7 @@ public class CmdFactionsMoneyTransferFp extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
Double amount = this.arg(0, ARDouble.get());
Faction from = this.arg(1, ARFaction.get());

4
src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java
View File

@ -9,7 +9,7 @@ import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARDouble;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.money.Money;
@ -44,7 +44,7 @@ public class CmdFactionsMoneyTransferPf extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
Double amount = this.arg(0, ARDouble.get());
MPlayer from = this.arg(1, ARMPlayer.getAny());

4
src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java
View File

@ -8,7 +8,7 @@ import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARDouble;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.money.Money;
@ -42,7 +42,7 @@ public class CmdFactionsMoneyWithdraw extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
Double amount = this.arg(0, ARDouble.get());
Faction from = this.arg(1, ARFaction.get(), msenderFaction);

4
src/com/massivecraft/factions/cmd/CmdFactionsName.java
View File

@ -9,7 +9,7 @@ import com.massivecraft.factions.entity.FactionColl;
import com.massivecraft.factions.entity.MPerm;
import com.massivecraft.factions.event.EventFactionsNameChange;
import com.massivecraft.factions.util.MiscUtil;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
public class CmdFactionsName extends FactionsCommand
@ -36,7 +36,7 @@ public class CmdFactionsName extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Args
String newName = this.arg(0);

4
src/com/massivecraft/factions/cmd/CmdFactionsPermList.java
View File

@ -5,7 +5,7 @@ import java.util.List;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.entity.MPerm;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARInteger;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.util.Txt;
@ -33,7 +33,7 @@ public class CmdFactionsPermList extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Args
Integer pageHumanBased = this.arg(0, ARInteger.get(), 1);

4
src/com/massivecraft/factions/cmd/CmdFactionsPermSet.java
View File

@ -11,7 +11,7 @@ import com.massivecraft.factions.cmd.arg.ARRel;
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.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARBoolean;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.util.Txt;
@ -42,7 +42,7 @@ public class CmdFactionsPermSet extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Args
MPerm perm = this.arg(0, ARMPerm.get());

4
src/com/massivecraft/factions/cmd/CmdFactionsPermShow.java
View File

@ -8,7 +8,7 @@ import com.massivecraft.factions.cmd.arg.ARFaction;
import com.massivecraft.factions.cmd.arg.ARMPerm;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.MPerm;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARList;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.util.Txt;
@ -38,7 +38,7 @@ public class CmdFactionsPermShow extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Arg: Faction
Faction faction = this.arg(0, ARFaction.get(), msenderFaction);

4
src/com/massivecraft/factions/cmd/CmdFactionsPlayer.java
View File

@ -8,8 +8,8 @@ import com.massivecraft.factions.cmd.arg.ARMPlayer;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.factions.event.EventFactionsRemovePlayerMillis;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.Progressbar;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.util.TimeDiffUtil;
import com.massivecraft.massivecore.util.TimeUnit;
@ -38,7 +38,7 @@ public class CmdFactionsPlayer extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Args
MPlayer mplayer = this.arg(0, ARMPlayer.getAny(), msender);

4
src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java
View File

@ -6,7 +6,7 @@ import com.massivecraft.factions.cmd.arg.ARMPlayer;
import com.massivecraft.factions.cmd.arg.ARFaction;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARDouble;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
@ -35,7 +35,7 @@ public class CmdFactionsPowerBoost extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
String type = this.arg(0).toLowerCase();
boolean doPlayer = true;

6
src/com/massivecraft/factions/cmd/CmdFactionsRank.java
View File

@ -13,7 +13,7 @@ import com.massivecraft.factions.entity.MFlag;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.factions.entity.MPlayerColl;
import com.massivecraft.factions.event.EventFactionsRankChange;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.util.IdUtil;
import com.massivecraft.massivecore.util.MUtil;
@ -64,7 +64,7 @@ public class CmdFactionsRank extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// This sets target and much other. Returns false if not succeeded.
if ( ! this.registerFields())
@ -122,7 +122,7 @@ public class CmdFactionsRank extends FactionsCommand
// PRIVATE
// -------------------------------------------- //
private boolean registerFields() throws MassiveCommandException
private boolean registerFields() throws MassiveException
{
// Getting the target and faction.
target = this.arg(0, ARMPlayer.getAny(), msender);

4
src/com/massivecraft/factions/cmd/CmdFactionsRelationAbstract.java
View File

@ -9,7 +9,7 @@ import com.massivecraft.factions.entity.MConf;
import com.massivecraft.factions.entity.MFlag;
import com.massivecraft.factions.entity.MPerm;
import com.massivecraft.factions.event.EventFactionsRelationChange;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
public abstract class CmdFactionsRelationAbstract extends FactionsCommand
@ -35,7 +35,7 @@ public abstract class CmdFactionsRelationAbstract extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Args
Faction otherFaction = this.arg(0, ARFaction.get());

4
src/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java
View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Perm;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARBoolean;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.cmd.req.ReqIsPlayer;
@ -31,7 +31,7 @@ public class CmdFactionsSeeChunk extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Args
boolean old = msender.isSeeingChunk();

4
src/com/massivecraft/factions/cmd/CmdFactionsSetAll.java
View File

@ -6,7 +6,7 @@ import com.massivecraft.factions.Perm;
import com.massivecraft.factions.entity.Board;
import com.massivecraft.factions.entity.BoardColl;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARWorldId;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.cmd.req.ReqIsPlayer;
@ -40,7 +40,7 @@ public class CmdFactionsSetAll extends CmdFactionsSetXAll
// -------------------------------------------- //
@Override
public Set<PS> getChunks() throws MassiveCommandException
public Set<PS> getChunks() throws MassiveException
{
// World
String word = (this.isClaim() ? "claim" : "unclaim");

4
src/com/massivecraft/factions/cmd/CmdFactionsSetAuto.java
View File

@ -8,7 +8,7 @@ import com.massivecraft.factions.cmd.arg.ARFaction;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.FactionColl;
import com.massivecraft.factions.entity.MPerm;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.cmd.req.ReqIsPlayer;
import com.massivecraft.massivecore.ps.PS;
@ -53,7 +53,7 @@ public class CmdFactionsSetAuto extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Args
final Faction newFaction;

4
src/com/massivecraft/factions/cmd/CmdFactionsSetCircle.java
View File

@ -4,7 +4,7 @@ import java.util.LinkedHashSet;
import java.util.Set;
import com.massivecraft.factions.Perm;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.cmd.req.ReqIsPlayer;
import com.massivecraft.massivecore.ps.PS;
@ -39,7 +39,7 @@ public class CmdFactionsSetCircle extends CmdFactionsSetXRadius
// -------------------------------------------- //
@Override
public Set<PS> getChunks() throws MassiveCommandException
public Set<PS> getChunks() throws MassiveException
{
// Common Startup
final PS chunk = PS.valueOf(me.getLocation()).getChunk(true);

4
src/com/massivecraft/factions/cmd/CmdFactionsSetSquare.java
View File

@ -4,7 +4,7 @@ import java.util.LinkedHashSet;
import java.util.Set;
import com.massivecraft.factions.Perm;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.cmd.req.ReqIsPlayer;
import com.massivecraft.massivecore.ps.PS;
@ -39,7 +39,7 @@ public class CmdFactionsSetSquare extends CmdFactionsSetXRadius
// -------------------------------------------- //
@Override
public Set<PS> getChunks() throws MassiveCommandException
public Set<PS> getChunks() throws MassiveException
{
// Common Startup
final PS chunk = PS.valueOf(me.getLocation()).getChunk(true);

8
src/com/massivecraft/factions/cmd/CmdFactionsSetX.java
View File

@ -5,7 +5,7 @@ import java.util.Set;
import com.massivecraft.factions.cmd.arg.ARFaction;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.FactionColl;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.ps.PS;
@ -45,7 +45,7 @@ public abstract class CmdFactionsSetX extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Args
final Faction newFaction = this.getNewFaction();
@ -59,13 +59,13 @@ public abstract class CmdFactionsSetX extends FactionsCommand
// ABSTRACT
// -------------------------------------------- //
public abstract Set<PS> getChunks() throws MassiveCommandException;
public abstract Set<PS> getChunks() throws MassiveException;
// -------------------------------------------- //
// EXTRAS
// -------------------------------------------- //
public Faction getNewFaction() throws MassiveCommandException
public Faction getNewFaction() throws MassiveException
{
if (this.isClaim())
{

4
src/com/massivecraft/factions/cmd/CmdFactionsSetXAll.java
View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.cmd.arg.ARFaction;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
public abstract class CmdFactionsSetXAll extends CmdFactionsSetX
{
@ -29,7 +29,7 @@ public abstract class CmdFactionsSetXAll extends CmdFactionsSetX
// EXTRAS
// -------------------------------------------- //
public Faction getOldFaction() throws MassiveCommandException
public Faction getOldFaction() throws MassiveException
{
return this.arg(1, ARFaction.get());
}

6
src/com/massivecraft/factions/cmd/CmdFactionsSetXRadius.java
View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARInteger;
@ -29,7 +29,7 @@ public abstract class CmdFactionsSetXRadius extends CmdFactionsSetX
// EXTRAS
// -------------------------------------------- //
public Integer getRadius() throws MassiveCommandException
public Integer getRadius() throws MassiveException
{
Integer radius = this.arg(0, ARInteger.get(), 1);
if (radius == null) return radius;
@ -51,7 +51,7 @@ public abstract class CmdFactionsSetXRadius extends CmdFactionsSetX
return radius;
}
public Integer getRadiusZero() throws MassiveCommandException
public Integer getRadiusZero() throws MassiveException
{
Integer ret = this.getRadius();
if (ret == null) return ret;

4
src/com/massivecraft/factions/cmd/CmdFactionsSethome.java
View File

@ -6,7 +6,7 @@ import com.massivecraft.factions.cmd.arg.ARFaction;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.MPerm;
import com.massivecraft.factions.event.EventFactionsHomeChange;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.cmd.req.ReqIsPlayer;
import com.massivecraft.massivecore.ps.PS;
@ -35,7 +35,7 @@ public class CmdFactionsSethome extends FactionsCommandHome
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Args
Faction faction = this.arg(0, ARFaction.get(), msenderFaction);

4
src/com/massivecraft/factions/cmd/CmdFactionsSetpower.java
View File

@ -5,7 +5,7 @@ import com.massivecraft.factions.cmd.arg.ARMPlayer;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.factions.event.EventFactionsPowerChange;
import com.massivecraft.factions.event.EventFactionsPowerChange.PowerChangeReason;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARDouble;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
@ -33,7 +33,7 @@ public class CmdFactionsSetpower extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Args
MPlayer mplayer = this.arg(0, ARMPlayer.getAny());

4
src/com/massivecraft/factions/cmd/CmdFactionsStatus.java
View File

@ -12,7 +12,7 @@ import com.massivecraft.factions.cmd.arg.ARSortMPlayer;
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.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARInteger;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.pager.PagerSimple;
@ -47,7 +47,7 @@ public class CmdFactionsStatus extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Args
Integer pageHumanBased = this.arg(0, ARInteger.get(), 1);

4
src/com/massivecraft/factions/cmd/CmdFactionsTitle.java
View File

@ -7,7 +7,7 @@ import com.massivecraft.factions.cmd.arg.ARMPlayer;
import com.massivecraft.factions.entity.MPerm;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.factions.event.EventFactionsTitleChange;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ARString;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.util.Txt;
@ -36,7 +36,7 @@ public class CmdFactionsTitle extends FactionsCommand
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Args
MPlayer you = this.arg(0, ARMPlayer.getAny());

4
src/com/massivecraft/factions/cmd/CmdFactionsUnsethome.java
View File

@ -5,7 +5,7 @@ import com.massivecraft.factions.cmd.arg.ARFaction;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.MPerm;
import com.massivecraft.factions.event.EventFactionsHomeChange;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
public class CmdFactionsUnsethome extends FactionsCommandHome
@ -31,7 +31,7 @@ public class CmdFactionsUnsethome extends FactionsCommandHome
// -------------------------------------------- //
@Override
public void perform() throws MassiveCommandException
public void perform() throws MassiveException
{
// Args
Faction faction = this.arg(0, ARFaction.get(), msenderFaction);

6
src/com/massivecraft/factions/cmd/arg/ARFaction.java
View File

@ -6,7 +6,7 @@ import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.FactionColl;
import com.massivecraft.massivecore.MassiveCore;
import com.massivecraft.massivecore.cmd.MassiveCommandException;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.cmd.arg.ArgReaderAbstract;
import com.massivecraft.massivecore.util.IdUtil;
@ -24,7 +24,7 @@ public class ARFaction extends ArgReaderAbstract<Faction>
// -------------------------------------------- //
@Override
public Faction read(String str, CommandSender sender) throws MassiveCommandException
public Faction read(String str, CommandSender sender) throws MassiveException
{
Faction ret;
@ -53,7 +53,7 @@ public class ARFaction extends ArgReaderAbstract<Faction>
return mplayer.getFaction();
}
throw new MassiveCommandException().addMsg("<b>No faction or player matching \"<p>%s<b>\".", str);
throw new MassiveException().addMsg("<b>No faction or player matching \"<p>%s<b>\".", str);
}
}

2
src/com/massivecraft/factions/entity/MFlag.java
View File

@ -87,7 +87,7 @@ public class MFlag extends Entity<MFlag> implements Prioritized, Registerable
public static MFlag getFlagExplosions() { return getCreative(PRIORITY_EXPLOSIONS, ID_EXPLOSIONS, ID_EXPLOSIONS, "Can explosions occur in this territory?", "Explosions can occur in this territory.", "Explosions can NOT occur in this territory.", true, false, true); }
public static MFlag getFlagOfflineexplosions() { return getCreative(PRIORITY_OFFLINEEXPLOSIONS, ID_OFFLINEEXPLOSIONS, ID_OFFLINEEXPLOSIONS, "Can explosions occur if faction is offline?", "Explosions if faction is offline.", "No explosions if faction is offline.", false, false, true); }
public static MFlag getFlagFirespread() { return getCreative(PRIORITY_FIRESPREAD, ID_FIRESPREAD, ID_FIRESPREAD, "Can fire spread in territory?", "Fire can spread in this territory.", "Fire can NOT spread in this territory.", true, false, true); }
public static MFlag getFlagEndergrief() { return getCreative(PRIORITY_ENDERGRIEF, ID_ENDERGRIEF, ID_ENDERGRIEF, "Can endermen grief in this territory?", "Endermen can grief in this territory", "Endermen can NOT grief in this territory.", false, false, true); }
public static MFlag getFlagEndergrief() { return getCreative(PRIORITY_ENDERGRIEF, ID_ENDERGRIEF, ID_ENDERGRIEF, "Can endermen grief in this territory?", "Endermen can grief in this territory.", "Endermen can NOT grief in this territory.", false, false, true); }
public static MFlag getFlagPermanent() { return getCreative(PRIORITY_PERMANENT, ID_PERMANENT, ID_PERMANENT, "Is the faction immune to deletion?", "The faction can NOT be deleted.", "The faction can be deleted.", false, false, true); }
public static MFlag getFlagPeaceful() { return getCreative(PRIORITY_PEACEFUL, ID_PEACEFUL, ID_PEACEFUL, "Is the faction in truce with everyone?", "The faction is in truce with everyone.", "The faction relations work as usual.", false, false, true); }
public static MFlag getFlagInfpower() { return getCreative(PRIORITY_INFPOWER, ID_INFPOWER, ID_INFPOWER, "Does the faction have infinite power?", "The faction has infinite power.", "The faction power works as usual.", false, false, true); }