This commit is contained in:
Olof Larsson 2013-01-09 10:59:21 +01:00
parent 3d0d0c1862
commit 693705fc10
4 changed files with 5 additions and 4 deletions

View File

@ -40,7 +40,7 @@ public class HelpCommand extends MCommand
Integer pagenumber = this.arg(0, ARInteger.get(), 1); Integer pagenumber = this.arg(0, ARInteger.get(), 1);
if (pagenumber == null) return; if (pagenumber == null) return;
sendMessage(Txt.getPage(lines, pagenumber, "Help for command \""+parentCommand.getAliases().get(0)+"\"")); sendMessage(Txt.getPage(lines, pagenumber, "Help for command \""+parentCommand.getAliases().get(0)+"\"", sender));
} }
@Override @Override

View File

@ -61,7 +61,6 @@ public abstract class Colls<C extends Coll<E, L>, E, L extends Comparable<? supe
public C getForWorld(String worldName) public C getForWorld(String worldName)
{ {
if (worldName == null) throw new IllegalArgumentException("worldName may not be null."); if (worldName == null) throw new IllegalArgumentException("worldName may not be null.");
return this.getForUniverse(this.universeFromWorldName(worldName)); return this.getForUniverse(this.universeFromWorldName(worldName));
} }
@ -86,7 +85,9 @@ public abstract class Colls<C extends Coll<E, L>, E, L extends Comparable<? supe
public C get(Object worldNameExtractable) public C get(Object worldNameExtractable)
{ {
if (worldNameExtractable == null) return null;
String worldName = MUtil.extract(String.class, "worldName", worldNameExtractable); String worldName = MUtil.extract(String.class, "worldName", worldNameExtractable);
if (worldName == null) return null;
return this.getForWorld(worldName); return this.getForWorld(worldName);
} }

View File

@ -36,6 +36,6 @@ public class CmdUsysAspectList extends UsysCommand
// Send them // Send them
lines = Txt.parseWrap(lines); lines = Txt.parseWrap(lines);
this.sendMessage(Txt.getPage(lines, pageHumanBased, "Aspect List")); this.sendMessage(Txt.getPage(lines, pageHumanBased, "Aspect List", sender));
} }
} }

View File

@ -36,6 +36,6 @@ public class CmdUsysMultiverseList extends UsysCommand
// Send them // Send them
lines = Txt.parseWrap(lines); lines = Txt.parseWrap(lines);
this.sendMessage(Txt.getPage(lines, pageHumanBased, "Multiverse List")); this.sendMessage(Txt.getPage(lines, pageHumanBased, "Multiverse List", sender));
} }
} }