diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-13 22:35:37 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-13 22:35:37 +0000 |
| commit | 9f422c3424f22f963662c18d3ef8d237d0f2e32d (patch) | |
| tree | e4d5185a2dc8c3af47257c81710c647405d7e613 /nms-patches | |
| parent | 01f0122a9e4ab863595a39ca4dca342f10dcc477 (diff) | |
| download | craftbukkit-9f422c3424f22f963662c18d3ef8d237d0f2e32d.tar craftbukkit-9f422c3424f22f963662c18d3ef8d237d0f2e32d.tar.gz craftbukkit-9f422c3424f22f963662c18d3ef8d237d0f2e32d.tar.lz craftbukkit-9f422c3424f22f963662c18d3ef8d237d0f2e32d.tar.xz craftbukkit-9f422c3424f22f963662c18d3ef8d237d0f2e32d.zip | |
SPIGOT-211: Fix mistake in EntityHuman breaking bed spawns
Diffstat (limited to 'nms-patches')
| -rw-r--r-- | nms-patches/EntityHuman.patch | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/nms-patches/EntityHuman.patch b/nms-patches/EntityHuman.patch index ca770d2c..ba6c4d5a 100644 --- a/nms-patches/EntityHuman.patch +++ b/nms-patches/EntityHuman.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde/net/minecraft/server/EntityHuman.java 2014-12-10 16:27:47.832575157 +0000 -+++ src/main/java/net/minecraft/server/EntityHuman.java 2014-12-10 16:27:27.556575377 +0000 +--- ../work/decompile-8eb82bde/net/minecraft/server/EntityHuman.java 2014-12-13 22:35:14.800546027 +0000 ++++ src/main/java/net/minecraft/server/EntityHuman.java 2014-12-13 22:34:55.728546234 +0000 @@ -8,13 +8,27 @@ import java.util.List; import java.util.UUID; @@ -172,7 +172,7 @@ this.a(entityitem); if (flag1) { -@@ -623,10 +702,18 @@ +@@ -623,6 +702,13 @@ this.bv = new BlockPosition(this); this.a(true, true, false); } @@ -186,11 +186,14 @@ if (nbttagcompound.hasKeyOfType("SpawnX", 99) && nbttagcompound.hasKeyOfType("SpawnY", 99) && nbttagcompound.hasKeyOfType("SpawnZ", 99)) { this.c = new BlockPosition(nbttagcompound.getInt("SpawnX"), nbttagcompound.getInt("SpawnY"), nbttagcompound.getInt("SpawnZ")); - this.d = nbttagcompound.getBoolean("SpawnForced"); -+ nbttagcompound.setString("SpawnWorld", spawnWorld); // CraftBukkit - fixes bed spawns for multiworld worlds +@@ -665,6 +751,7 @@ + if (itemstack != null && itemstack.getItem() != null) { + nbttagcompound.set("SelectedItem", itemstack.save(new NBTTagCompound())); } ++ nbttagcompound.setString("SpawnWorld", spawnWorld); // CraftBukkit - fixes bed spawns for multiworld worlds + + } - this.foodData.a(nbttagcompound); @@ -684,7 +771,7 @@ if (damagesource.r()) { |