updated to Bukkit 1.1-R2

build.xml

@@ -16,8 +16,8 @@
 		<javac srcdir="${src}" destdir="${build}" debug="on" debuglevel="lines,vars,source" includeantruntime="false" encoding="Cp1252">
 			<classpath>
 				<pathelement path="${lib}" />
-				<pathelement location="${lib}/bukkit-1.1-R1-SNAPSHOT.jar" />
-				<pathelement location="${lib}/craftbukkit-1.1-R1-SNAPSHOT.jar" />
+				<pathelement location="${lib}/bukkit-1.1-R2.jar" />
+				<pathelement location="${lib}/craftbukkit-1.1-R2.jar" />
 				<pathelement location="${lib}/CitizensAPI.jar" />
 				<pathelement location="${lib}/junit.jar" />
 				<pathelement location="${lib}/hamcrest.jar" />

pom.xml

@@ -11,7 +11,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<craftbukkit.version>1.1-R1-SNAPSHOT</craftbukkit.version>
+		<craftbukkit.version>1.1-R2</craftbukkit.version>
 		<build.number>Unknown</build.number>
 	</properties>
 

src/net/citizensnpcs/npc/CitizensNPC.java

@@ -41,7 +41,7 @@ public class CitizensNPC extends AbstractNPC {
 
     @Override
     public Player getBukkitEntity() {
-        return getHandle().getPlayer();
+        return getHandle().getBukkitEntity();
     }
 
     public CraftNPC getHandle() {

src/net/citizensnpcs/resource/lib/CraftNPC.java

@@ -14,7 +14,6 @@ import net.minecraft.server.World;
 
 import org.bukkit.craftbukkit.entity.CraftEntity;
 import org.bukkit.craftbukkit.entity.CraftPlayer;
-import org.bukkit.entity.Entity;
 
 @SuppressWarnings("unchecked")
 public class CraftNPC extends EntityPlayer {
@@ -40,7 +39,7 @@ public class CraftNPC extends EntityPlayer {
     }
 
     @Override
-    public Entity getBukkitEntity() {
+    public CraftPlayer getBukkitEntity() {
         if (this.bukkitEntity == null) {
             super.getBukkitEntity();
             removeFromPlayerMap(name);