Update for 1.5_02.

7 files changed, 14 insertions, 13 deletions

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 90fbb28c..987ab355 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -42,7 +42,7 @@ import org.bukkit.util.config.Configuration;
 public final class CraftServer implements Server {
     private final String serverName = "Craftbukkit";
     private final String serverVersion;
-    private final String protocolVersion = "1.4";
+    private final String protocolVersion = "1.5_02";
     private final PluginManager pluginManager = new SimplePluginManager(this);
     private final BukkitScheduler scheduler =  new CraftScheduler(this);
     private final CommandMap commandMap = new SimpleCommandMap(this);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 162a2bfb..def940e4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -50,7 +50,7 @@ public class CraftWorld implements World {
         unloadedChunks.put( (chunk.getX() << 16) + chunk.getZ(), chunk );
     }
 
-    public CraftChunk popPreservedChunk( int x, int z ) {
+    public Chunk popPreservedChunk( int x, int z ) {
         return unloadedChunks.remove( (x << 16) + z );
     }
 
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index c1e03dc8..61c9edc9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -3,6 +3,7 @@ package org.bukkit.craftbukkit.entity;
 import net.minecraft.server.*;
 
 import org.bukkit.Location;
+import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.CraftWorld;
@@ -201,7 +202,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
         return "CraftEntity{" + "id=" + getEntityId() + '}';
     }
 
-    public CraftServer getServer() {
+    public Server getServer() {
         return server;
     }
 
@@ -213,7 +214,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
         setVelocity(value);
     }
 
-    public CraftEntity getPassenger() {
+    public org.bukkit.entity.Entity getPassenger() {
         return isEmpty() ? null : (CraftEntity) getHandle().passenger.getBukkitEntity();
     }
 
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
index 365d9ad1..b7b2d63e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -4,8 +4,8 @@ package org.bukkit.craftbukkit.entity;
 import net.minecraft.server.EntityHuman;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer;
-import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.craftbukkit.CraftServer;
 
 public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -31,11 +31,11 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
         this.inventory = new CraftInventoryPlayer( entity.inventory );
     }
 
-    public CraftInventoryPlayer getInventory() {
+    public PlayerInventory getInventory() {
         return inventory;
     }
 
-    public CraftItemStack getItemInHand() {
+    public ItemStack getItemInHand() {
         return getInventory().getItemInHand();
     }
 
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
index 104683c8..0dc57f63 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
@@ -21,7 +21,7 @@ public class CraftSlime extends CraftLivingEntity implements Slime {
     }
 
     public int getSize() {
-        return getHandle().m();
+        return getHandle().getSize();
     }
 
     public void setSize(int size) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
index 1a6e5974..9a6a8a88 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
@@ -11,19 +11,19 @@ public class CraftWolf extends CraftAnimals implements Wolf {
     }
 
     public boolean isAngry() {
-        return getHandle().x();
+        return getHandle().isAngry();
     }
 
     public void setAngry(boolean angry) {
-        getHandle().c(angry);
+        getHandle().setAngry(angry);
     }
 
     public boolean isSitting() {
-        return getHandle().y();
+        return getHandle().isSitting();
     }
 
     public void setSitting(boolean sitting) {
-        getHandle().d(sitting);
+        getHandle().setSitting(sitting);
     }
 
     @Override
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
index 5d97b4cf..68adab93 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
@@ -18,7 +18,7 @@ public class CraftInventoryPlayer extends CraftInventory implements PlayerInvent
         return super.getSize() - 4;
     }
 
-    public CraftItemStack getItemInHand() {
+    public ItemStack getItemInHand() {
         return new CraftItemStack( getInventory().getItemInHand() );
     }