Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MassiveCore - Various Improvements

Browse Source
This commit is contained in:
Olof Larsson 2016-03-04 14:10:54 +01:00
parent 33e1d7749b
commit 259cf71e27
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/massivecraft/factions/cmd/CmdFactions.java
View File

@ -5,8 +5,8 @@ import java.util.List;
import com.massivecraft.factions.Factions; import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm; import com.massivecraft.factions.Perm;
import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.entity.MConf;
import com.massivecraft.massivecore.command.DeprecatedCommand; import com.massivecraft.massivecore.command.MassiveCommandDeprecated;
import com.massivecraft.massivecore.command.VersionCommand; import com.massivecraft.massivecore.command.MassiveCommandVersion;
public class CmdFactions extends FactionsCommand public class CmdFactions extends FactionsCommand
{ {
@ -67,7 +67,7 @@ public class CmdFactions extends FactionsCommand
public CmdFactionsDisband cmdFactionsDisband = new CmdFactionsDisband(); public CmdFactionsDisband cmdFactionsDisband = new CmdFactionsDisband();
public CmdFactionsPowerBoost cmdFactionsPowerBoost = new CmdFactionsPowerBoost(); public CmdFactionsPowerBoost cmdFactionsPowerBoost = new CmdFactionsPowerBoost();
public CmdFactionsSetpower cmdFactionsSetpower = new CmdFactionsSetpower(); public CmdFactionsSetpower cmdFactionsSetpower = new CmdFactionsSetpower();
public VersionCommand cmdFactionsVersion = new VersionCommand(Factions.get(), Perm.VERSION.node, "v", "version"); public MassiveCommandVersion cmdFactionsVersion = new MassiveCommandVersion(Factions.get(), Perm.VERSION.node, "v", "version");
// -------------------------------------------- // // -------------------------------------------- //
// CONSTRUCT // CONSTRUCT
@ -125,10 +125,10 @@ public class CmdFactions extends FactionsCommand
this.addChild(this.cmdFactionsVersion); this.addChild(this.cmdFactionsVersion);
// Deprecated Commands // Deprecated Commands
this.addChild(new DeprecatedCommand(this.cmdFactionsClaim.cmdFactionsClaimAuto, "autoclaim")); this.addChild(new MassiveCommandDeprecated(this.cmdFactionsClaim.cmdFactionsClaimAuto, "autoclaim"));
this.addChild(new DeprecatedCommand(this.cmdFactionsUnclaim.cmdFactionsUnclaimAll, "unclaimall")); this.addChild(new MassiveCommandDeprecated(this.cmdFactionsUnclaim.cmdFactionsUnclaimAll, "unclaimall"));
this.addChild(new DeprecatedCommand(this.cmdFactionsFlag, "open")); this.addChild(new MassiveCommandDeprecated(this.cmdFactionsFlag, "open"));
this.addChild(new DeprecatedCommand(this.cmdFactionsFaction, "show", "who")); this.addChild(new MassiveCommandDeprecated(this.cmdFactionsFaction, "show", "who"));
} }
// -------------------------------------------- // // -------------------------------------------- //

6
src/com/massivecraft/factions/entity/FactionColl.java
View File

@ -254,6 +254,7 @@ public class FactionColl extends Coll<Faction>
return errors; return errors;
} }
@Override
public Faction getByName(String name) public Faction getByName(String name)
{ {
String compStr = MiscUtil.getComparisonString(name); String compStr = MiscUtil.getComparisonString(name);
@ -266,11 +267,6 @@ public class FactionColl extends Coll<Faction>
} }
return null; return null;
} }
public boolean isNameTaken(String str)
{
return this.getByName(str) != null;
}
// -------------------------------------------- // // -------------------------------------------- //
// PREDICATE LOGIC // PREDICATE LOGIC