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

Improved ARUniverse

Browse Source
This commit is contained in:
Olof Larsson 2015-05-11 14:59:01 +02:00
parent b286c81cb3
commit a5bbdf1b3e
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/com/massivecraft/massivecore/cmd/arg/ARUniverse.java
View File

@ -5,6 +5,7 @@ import java.util.Collection;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import com.massivecraft.massivecore.Aspect;
import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.Multiverse; import com.massivecraft.massivecore.Multiverse;
import com.massivecraft.massivecore.collections.MassiveSet; import com.massivecraft.massivecore.collections.MassiveSet;
@ -12,21 +13,28 @@ import com.massivecraft.massivecore.util.Txt;
public class ARUniverse extends ARAbstract<String> public class ARUniverse extends ARAbstract<String>
{ {
// -------------------------------------------- //
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
public ARUniverse(Multiverse multiverse)
{
this.multiverse = multiverse;
}
// -------------------------------------------- // // -------------------------------------------- //
// FIELDS // FIELDS
// -------------------------------------------- // // -------------------------------------------- //
protected Multiverse multiverse; protected Aspect aspect = null;
public Multiverse getMultiverse() { return this.multiverse; } protected Multiverse multiverse = null;
public Multiverse getMultiverse()
{
if (this.aspect != null) return this.aspect.getMultiverse();
return this.multiverse;
}
// -------------------------------------------- //
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
public static ARUniverse get(Aspect aspect) { return new ARUniverse(aspect); }
public static ARUniverse get(Multiverse multiverse) { return new ARUniverse(multiverse); }
public ARUniverse(Aspect aspect) { this.aspect = aspect; }
public ARUniverse(Multiverse multiverse) { this.multiverse = multiverse; }
// -------------------------------------------- // // -------------------------------------------- //
// OVERRIDE // OVERRIDE
@ -35,6 +43,8 @@ public class ARUniverse extends ARAbstract<String>
@Override @Override
public String read(String arg, CommandSender sender) throws MassiveException public String read(String arg, CommandSender sender) throws MassiveException
{ {
Multiverse multiverse = this.getMultiverse();
if (multiverse.containsUniverse(arg)) if (multiverse.containsUniverse(arg))
{ {
return arg; return arg;
@ -48,7 +58,7 @@ public class ARUniverse extends ARAbstract<String>
String dot = Txt.parse("<i>."); String dot = Txt.parse("<i>.");
throw new MassiveException() throw new MassiveException()
.addMsg("<b>No universe \"<h>%s<b>\" exists in multiverse <h>%s<b>.", arg, this.multiverse.getId()) .addMsg("<b>No universe \"<h>%s<b>\" exists in multiverse <h>%s<b>.", arg, multiverse.getId())
.addMsg("<i>Use %s", Txt.implodeCommaAndDot(names, format, comma, and, dot)); .addMsg("<i>Use %s", Txt.implodeCommaAndDot(names, format, comma, and, dot));
} }
} }