From 693705fc107bf5fdbdfebe607e6b28e74a1181f0 Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Wed, 9 Jan 2013 10:59:21 +0100
Subject: [PATCH] pager

---
 src/com/massivecraft/mcore5/cmd/HelpCommand.java               | 2 +-
 src/com/massivecraft/mcore5/store/Colls.java                   | 3 ++-
 src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspectList.java    | 2 +-
 .../massivecraft/mcore5/usys/cmd/CmdUsysMultiverseList.java    | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/com/massivecraft/mcore5/cmd/HelpCommand.java b/src/com/massivecraft/mcore5/cmd/HelpCommand.java
index 65249366..1b349cbd 100644
--- a/src/com/massivecraft/mcore5/cmd/HelpCommand.java
+++ b/src/com/massivecraft/mcore5/cmd/HelpCommand.java
@@ -40,7 +40,7 @@ public class HelpCommand extends MCommand
 		
 		Integer pagenumber = this.arg(0, ARInteger.get(), 1);
 		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
diff --git a/src/com/massivecraft/mcore5/store/Colls.java b/src/com/massivecraft/mcore5/store/Colls.java
index 46169e1e..005318ab 100644
--- a/src/com/massivecraft/mcore5/store/Colls.java
+++ b/src/com/massivecraft/mcore5/store/Colls.java
@@ -61,7 +61,6 @@ public abstract class Colls<C extends Coll<E, L>, E, L extends Comparable<? supe
 	public C getForWorld(String worldName)
 	{
 		if (worldName == null) throw new IllegalArgumentException("worldName may not be null.");
-		
 		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)
 	{
+		if (worldNameExtractable == null) return null;
 		String worldName = MUtil.extract(String.class, "worldName", worldNameExtractable);
+		if (worldName == null) return null;
 		return this.getForWorld(worldName);
 	}
 	
diff --git a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspectList.java b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspectList.java
index 7d31141a..9ff5eee4 100644
--- a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspectList.java
+++ b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspectList.java
@@ -36,6 +36,6 @@ public class CmdUsysAspectList extends UsysCommand
 				
 		// Send them
 		lines = Txt.parseWrap(lines);
-		this.sendMessage(Txt.getPage(lines, pageHumanBased, "Aspect List"));	
+		this.sendMessage(Txt.getPage(lines, pageHumanBased, "Aspect List", sender));	
 	}
 }
diff --git a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseList.java b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseList.java
index 7fd5239b..1257088b 100644
--- a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseList.java
+++ b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseList.java
@@ -36,6 +36,6 @@ public class CmdUsysMultiverseList extends UsysCommand
 				
 		// Send them
 		lines = Txt.parseWrap(lines);
-		this.sendMessage(Txt.getPage(lines, pageHumanBased, "Multiverse List"));	
+		this.sendMessage(Txt.getPage(lines, pageHumanBased, "Multiverse List", sender));	
 	}
 }