diff options
| author | md_5 <git@md-5.net> | 2016-06-30 13:21:22 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-06-30 13:21:22 +1000 |
| commit | 1fe19a83f9c0cf8a4fb4b51bdd85b583dda7df8c (patch) | |
| tree | 363d5f97f130a777f427f6bdc232433b96b46ec4 /src | |
| parent | 4c43856621d8a004b255e2eb94e8288a0ffaf39a (diff) | |
| download | craftbukkit-1fe19a83f9c0cf8a4fb4b51bdd85b583dda7df8c.tar craftbukkit-1fe19a83f9c0cf8a4fb4b51bdd85b583dda7df8c.tar.gz craftbukkit-1fe19a83f9c0cf8a4fb4b51bdd85b583dda7df8c.tar.lz craftbukkit-1fe19a83f9c0cf8a4fb4b51bdd85b583dda7df8c.tar.xz craftbukkit-1fe19a83f9c0cf8a4fb4b51bdd85b583dda7df8c.zip | |
SPIGOT-1129: Fix spawning leash hitch without adjacent block
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 2fe3eae8..47a050e5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1092,14 +1092,16 @@ public class CraftWorld implements World { } } - EnumDirection dir = CraftBlock.blockFaceToNotch(face).opposite(); - if (Painting.class.isAssignableFrom(clazz)) { - entity = new EntityPainting(world, new BlockPosition((int) x, (int) y, (int) z), dir); - } else if (ItemFrame.class.isAssignableFrom(clazz)) { - entity = new EntityItemFrame(world, new BlockPosition((int) x, (int) y, (int) z), dir); - } else if (LeashHitch.class.isAssignableFrom(clazz)) { + if (LeashHitch.class.isAssignableFrom(clazz)) { entity = new EntityLeash(world, new BlockPosition((int) x, (int) y, (int) z)); entity.attachedToPlayer = true; + } else { + EnumDirection dir = CraftBlock.blockFaceToNotch(face).opposite(); + if (Painting.class.isAssignableFrom(clazz)) { + entity = new EntityPainting(world, new BlockPosition((int) x, (int) y, (int) z), dir); + } else if (ItemFrame.class.isAssignableFrom(clazz)) { + entity = new EntityItemFrame(world, new BlockPosition((int) x, (int) y, (int) z), dir); + } } if (entity != null && !((EntityHanging) entity).survives()) { |