summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authort00thpick1 <t00thpick1dirko@gmail.com>2013-12-17 20:27:49 -0500
committermbax <matt@phozop.net>2013-12-17 22:29:12 -0500
commit3cd64185a900584d24aec2916b95898ec277839c (patch)
tree7bdec4a31f4da751f39511f03b6c6ddc12134630
parent8da512628263584ab75b4fb932781a2f242d08a5 (diff)
downloadcraftbukkit-3cd64185a900584d24aec2916b95898ec277839c.tar
craftbukkit-3cd64185a900584d24aec2916b95898ec277839c.tar.gz
craftbukkit-3cd64185a900584d24aec2916b95898ec277839c.tar.lz
craftbukkit-3cd64185a900584d24aec2916b95898ec277839c.tar.xz
craftbukkit-3cd64185a900584d24aec2916b95898ec277839c.zip
[Bleeding] Correctly generate torches on portal. Fixes BUKKIT-746
In the CraftBlockState implementation, updating the blockstate onto a block will force the block state data value onto the block. Unlike vanilla which relied on block data being set when the type changed, we must instead explicitely set the data in the blockstate.
-rw-r--r--src/main/java/net/minecraft/server/EntityEnderDragon.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
index 68e97f17..ec347127 100644
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
@@ -606,10 +606,10 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
world.setType(i, b0 + 0, j, Blocks.BEDROCK);
world.setType(i, b0 + 1, j, Blocks.BEDROCK);
world.setType(i, b0 + 2, j, Blocks.BEDROCK);
- world.setType(i - 1, b0 + 2, j, Blocks.TORCH);
- world.setType(i + 1, b0 + 2, j, Blocks.TORCH);
- world.setType(i, b0 + 2, j - 1, Blocks.TORCH);
- world.setType(i, b0 + 2, j + 1, Blocks.TORCH);
+ world.setTypeAndData(i - 1, b0 + 2, j, Blocks.TORCH, 2, 0);
+ world.setTypeAndData(i + 1, b0 + 2, j, Blocks.TORCH, 1, 0);
+ world.setTypeAndData(i, b0 + 2, j - 1, Blocks.TORCH, 4, 0);
+ world.setTypeAndData(i, b0 + 2, j + 1, Blocks.TORCH, 3, 0);
world.setType(i, b0 + 3, j, Blocks.BEDROCK);
world.setType(i, b0 + 4, j, Blocks.DRAGON_EGG);