Update for 1.6.5

4 files changed, 10 insertions, 27 deletions

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 18f86c70..9355786e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -59,7 +59,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.6.4";
+    private final String protocolVersion = "1.6.5";
     private final PluginManager pluginManager = new SimplePluginManager(this);
     private final ServicesManager servicesManager = new SimpleServicesManager();
     private final BukkitScheduler scheduler =  new CraftScheduler(this);
@@ -366,8 +366,8 @@ public final class CraftServer implements Server {
             converter.convert(name, new ConvertProgressUpdater(console));
         }
 
-        int dimension = environment.getId() + 200 + console.worlds.size();
-        WorldServer internal = new WorldServer(console, new ServerNBTManager(new File("."), name, true), name, dimension, seed);
+        int dimension = 200 + console.worlds.size();
+        WorldServer internal = new WorldServer(console, new ServerNBTManager(new File("."), name, true), name, dimension, seed, environment);
         internal.z = console.worlds.get(0).z;
 
         internal.tracker = new EntityTracker(console, dimension);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
index 9de2a0a7..5cf0c5b3 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
@@ -19,7 +19,7 @@ public class CraftCreeper extends CraftMonster implements Creeper {
     }
 
     public boolean isPowered() {
-        return getHandle().X().a(17) == 1;
+        return getHandle().Z().a(17) == 1;
     }
 
     public void setPowered(boolean powered) {
@@ -32,14 +32,14 @@ public class CraftCreeper extends CraftMonster implements Creeper {
             server.getPluginManager().callEvent(event);
 
             if (!event.isCancelled()) {
-                getHandle().X().b(17, (byte)1);
+                getHandle().Z().b(17, (byte)1);
             }
         } else {
             CreeperPowerEvent event = new CreeperPowerEvent(entity, CreeperPowerEvent.PowerCause.SET_OFF);
             server.getPluginManager().callEvent(event);
 
             if (!event.isCancelled()) {
-                getHandle().X().b(17, (byte)0);
+                getHandle().Z().b(17, (byte)0);
             }
         }
 
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index ce9d1a19..4e4a409e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -172,25 +172,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         EntityPlayer entity = getHandle();
 
         if (oldWorld != newWorld) {
-            entity.dimension = newWorld.dimension;
-            entity.netServerHandler.sendPacket(new Packet9Respawn((byte) location.getWorld().getEnvironment().getId()));
-            oldWorld.removeEntity(entity);
-            entity.dead = false;
-
-            entity.setPositionRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
-            if (entity.Q()) {
-                oldWorld.entityJoinedWorld(entity, false);
-                newWorld.addEntity(entity);
-                entity.setPositionRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
-                newWorld.entityJoinedWorld(entity, false);
-            }
-
-            manager.a(entity);
-            entity.netServerHandler.a(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
-            entity.a((World)newWorld);
-            manager.a(entity, newWorld);
-            entity.a(entity.defaultContainer);
-
+            this.sendMessage("Multiworld teleporting disabled in this build. Nether works");
+//            this.entity = manager.a(entity, newWorld.dimension, false);
             return true;
         } else {
             return entity.netServerHandler.teleport(location);
@@ -214,7 +197,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
     }
 
     public void updateInventory() {
-        getHandle().syncInventory();
+        getHandle().a(getHandle().activeContainer);
     }
 
     public void setSleepingIgnored(boolean isSleeping) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
index 9e69da70..56a14e0c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
@@ -35,7 +35,7 @@ public class CraftWolf extends CraftAnimals implements Wolf {
     }
 
     public boolean isTamed() {
-        return getHandle().m_();
+        return getHandle().A();
     }
 
     public void setTamed(boolean tame) {