Merge branch 'master' of https://github.com/essentials/Essentials

7 files changed, 49 insertions, 5 deletions

diff --git a/Essentials/src/net/ess3/api/server/Block.java b/Essentials/src/net/ess3/api/server/Block.java
index 52bc440f9..633c1c6f8 100644
--- a/Essentials/src/net/ess3/api/server/Block.java
+++ b/Essentials/src/net/ess3/api/server/Block.java
@@ -18,7 +18,7 @@ public class Block {
 
 	public ItemStack convertToItem()
 	{
-		final ItemStack is = ItemStack.create(this.getType(), 1, this.getDurability());
-		return this.getType().convertToItem(is);
+		final ItemStack is = ItemStack.create(this.stack.getType(), 1, this.stack.getDurability());
+		return this.stack.getType().convertToItem(is);
 	}
 }
diff --git a/Essentials/src/net/ess3/bukkit/BukkitCommandSender.java b/Essentials/src/net/ess3/bukkit/BukkitCommandSender.java
index 60302badc..278a7bcba 100644
--- a/Essentials/src/net/ess3/bukkit/BukkitCommandSender.java
+++ b/Essentials/src/net/ess3/bukkit/BukkitCommandSender.java
@@ -1,9 +1,9 @@
 package net.ess3.bukkit;
 
-import net.ess3.api.server.CommandSender;
-import net.ess3.api.server.Permission;
 import lombok.Delegate;
 import lombok.Getter;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Permission;
 
 
 public class BukkitCommandSender implements CommandSender
@@ -29,6 +29,7 @@ public class BukkitCommandSender implements CommandSender
 		return commandSender.isOp();
 	}
 	
+	@Override
 	public boolean hasPermission(Permission permission)
 	{
 		if (commandSender == null) {
@@ -37,4 +38,16 @@ public class BukkitCommandSender implements CommandSender
 			return commandSender.hasPermission(((BukkitPermission)permission).getBukkitPermission());
 		}
 	}
+
+	@Override
+	public void sendMessage(String message)
+	{
+		commandSender.sendMessage(message);
+	}
+
+	@Override
+	public void sendMessage(String[] string)
+	{
+		commandSender.sendMessage(string);
+	}
 }
diff --git a/Essentials/src/net/ess3/bukkit/BukkitMaterial.java b/Essentials/src/net/ess3/bukkit/BukkitMaterial.java
index ee0391eaa..84a6e7145 100644
--- a/Essentials/src/net/ess3/bukkit/BukkitMaterial.java
+++ b/Essentials/src/net/ess3/bukkit/BukkitMaterial.java
@@ -18,6 +18,18 @@ public class BukkitMaterial extends Material
 		}
 	}
 
+	@Override
+	public int getId()
+	{
+		return this.material.getId();
+	}
+
+	@Override
+	public int getMaxStackSize()
+	{
+		return this.material.getMaxStackSize();
+	}
+
 	private interface Excludes {
 		short getMaxDurability();
 	}
diff --git a/Essentials/test/net/ess3/testserver/TestPlayer.java b/Essentials/test/net/ess3/testserver/TestPlayer.java
index 70b8d0e11..5f4e75f17 100644
--- a/Essentials/test/net/ess3/testserver/TestPlayer.java
+++ b/Essentials/test/net/ess3/testserver/TestPlayer.java
@@ -197,4 +197,10 @@ public class TestPlayer implements Player {
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
+	@Override
+	public boolean isInSurvivalMode()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
 }
diff --git a/Essentials/test/net/ess3/testserver/TestPlugin.java b/Essentials/test/net/ess3/testserver/TestPlugin.java
index 9645c7902..6d624ab6d 100644
--- a/Essentials/test/net/ess3/testserver/TestPlugin.java
+++ b/Essentials/test/net/ess3/testserver/TestPlugin.java
@@ -6,6 +6,7 @@ import java.util.logging.Logger;
 import net.ess3.api.server.Location;
 import net.ess3.api.server.Player;
 import net.ess3.api.server.Plugin;
+import net.ess3.api.server.Server;
 
 public class TestPlugin implements Plugin {
 
@@ -93,4 +94,10 @@ public class TestPlugin implements Plugin {
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
+	@Override
+	public Server getServer()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
 }
diff --git a/Essentials/test/net/ess3/testserver/TestServer.java b/Essentials/test/net/ess3/testserver/TestServer.java
index b46d13dd8..40b4cb217 100644
--- a/Essentials/test/net/ess3/testserver/TestServer.java
+++ b/Essentials/test/net/ess3/testserver/TestServer.java
@@ -86,4 +86,10 @@ public class TestServer implements Server {
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
+	@Override
+	public Player getPlayer(String name)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
 }
diff --git a/pom.xml b/pom.xml
index 0d45ef8e3..8446b854a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <bukkit.version>1.2.5-R4.1-SNAPSHOT</bukkit.version>
+    <bukkit.version>1.3.1-R0.1-SNAPSHOT</bukkit.version>
     <build.number>Unknown</build.number>
     <org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>true</org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>
     <org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>2</org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>