Plugin version increased, fix bug in home command

- Fixed a null pointer in the home command - Changed version
ZachBora · May 4, 2014 · a2a3ed0 · a2a3ed0
1 parent 36537ab
commit a2a3ed0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/plugin.yml b/plugin.yml
@@ -1,6 +1,6 @@
 name: PlotMe
 main: com.worldcretornica.plotme.PlotMe
-version: '0.13f'
+version: '0.13g'
 author: ZachBora
 load: startup
 website: http://dev.bukkit.org/server-mods/plotme/

diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.worldcretornica</groupId>
   <artifactId>PlotMe</artifactId>
-  <version>0.13f-SNAPSHOT</version>
+  <version>0.13g-SNAPSHOT</version>
   <name>PlotMe</name>
   <url>http://dev.bukkit.org/bukkit-mods/plotme/</url>
   <build>

diff --git a/src/com/worldcretornica/plotme/PMCommand.java b/src/com/worldcretornica/plotme/PMCommand.java
@@ -2095,7 +2095,8 @@ private boolean home(Player p, String[] args)
 				String playername = p.getName();
 				UUID uuid = p.getUniqueId();
 				int nb = 1;
-				World w;
+				World w = null;
+				String worldname = "";
 
 				if(!PlotManager.isPlotWorld(p) && PlotMe.allowWorldTeleport)
 				{
@@ -2106,6 +2107,10 @@ private boolean home(Player p, String[] args)
 					w = p.getWorld();
 				}
 
+				if(w != null) {
+				    worldname = w.getName();
+				}
+
 				if(args[0].contains(":"))
 				{
 					try{
@@ -2140,6 +2145,7 @@ private boolean home(Player p, String[] args)
 					else
 					{
 						w = Bukkit.getWorld(args[1]);
+						worldname = args[1];
 					}
 				}
 
@@ -2153,12 +2159,13 @@ private boolean home(Player p, String[] args)
 					else
 					{
 						w = Bukkit.getWorld(args[2]);
+						worldname = args[2];
 					}
 				}
 
 				if(!PlotManager.isPlotWorld(w))
 				{
-					Send(p, RED + w.getName() + C("MsgWorldNotPlot"));
+					Send(p, RED + worldname + C("MsgWorldNotPlot"));
 				}
 				else
 				{