summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorDinnerbone <dinnerbone@dinnerbone.com>2011-02-06 14:25:19 +0000
committerDinnerbone <dinnerbone@dinnerbone.com>2011-02-07 01:51:06 +0000
commit4e6f4e303129951e6aa6dbf4240c46c6fce19c98 (patch)
treee1dea9078009219add5e8bc4209ec871593a3124 /src/main/java
parentdcabbda57c2b3d1af21e652ba9d896da13eca455 (diff)
downloadcraftbukkit-4e6f4e303129951e6aa6dbf4240c46c6fce19c98.tar
craftbukkit-4e6f4e303129951e6aa6dbf4240c46c6fce19c98.tar.gz
craftbukkit-4e6f4e303129951e6aa6dbf4240c46c6fce19c98.tar.lz
craftbukkit-4e6f4e303129951e6aa6dbf4240c46c6fce19c98.tar.xz
craftbukkit-4e6f4e303129951e6aa6dbf4240c46c6fce19c98.zip
NPE
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/net/minecraft/server/PlayerInstance.java3
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/PlayerInstance.java b/src/main/java/net/minecraft/server/PlayerInstance.java
index 23443e03..6fe3b9c1 100644
--- a/src/main/java/net/minecraft/server/PlayerInstance.java
+++ b/src/main/java/net/minecraft/server/PlayerInstance.java
@@ -162,6 +162,9 @@ class PlayerInstance {
} else {
this.a((Packet) (new Packet52MultiBlockChange(this.c, this.d, this.f, this.g, world))); // Craftbukkit
+ System.out.println("MultiBlockChange called for world " + world.w);
+ new Exception().printStackTrace();
+
for (i = 0; i < this.g; ++i) {
j = this.c * 16 + (this.g >> 12 & 15);
k = this.g & 255;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f1c62d50..4b42c04f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -142,8 +142,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
newEntity.l();
entity.a.e = newEntity;
- newEntity.inventory = entity.inventory;
- newEntity.inventory.e = newEntity;
entity = newEntity;
} else {
entity.a.a(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());