core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0390-Fix-spawning-of-hangin...

26 lines
1.6 KiB
Diff
Raw Normal View History

Rebuild all patches using the new rebuild pattern
2020-05-06 09:48:49 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
[PATCH] bounding box check for hanging entities (#2664) This patch intends to fix an issue with LeashHitchs where an exception was thrown due EntityHanging#calculateBoundingBox not being able to accept EnumDirections UP and DOWN. This issue was introduced in a fix for SPIGOT-4674 (d65a2576e40e58c8e446b330febe6799d13a604f)
2019-10-30 17:29:40 +00:00
From: MisterErwin <git@askarian.net>
Date: Wed, 30 Oct 2019 16:57:54 +0100
Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and
can not face UP or DOWN
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
[WIP|1.16] Misc fixes (#3627)
2020-06-26 16:20:03 +00:00
index ee44171831350c7baf868b74ed9d5b8bf3ed6d4a..60e3a7422045148447a45685f66ed0ebb5172bf6 100644
[PATCH] bounding box check for hanging entities (#2664) This patch intends to fix an issue with LeashHitchs where an exception was thrown due EntityHanging#calculateBoundingBox not being able to accept EnumDirections UP and DOWN. This issue was introduced in a fix for SPIGOT-4674 (d65a2576e40e58c8e446b330febe6799d13a604f)
2019-10-30 17:29:40 +00:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
[WIP|1.16] Misc fixes (#3627)
2020-06-26 16:20:03 +00:00
@@ -1861,7 +1861,12 @@ public class CraftWorld implements World {
[PATCH] bounding box check for hanging entities (#2664) This patch intends to fix an issue with LeashHitchs where an exception was thrown due EntityHanging#calculateBoundingBox not being able to accept EnumDirections UP and DOWN. This issue was introduced in a fix for SPIGOT-4674 (d65a2576e40e58c8e446b330febe6799d13a604f)
2019-10-30 17:29:40 +00:00
height = 9;
}
- BlockFace[] faces = new BlockFace[]{BlockFace.EAST, BlockFace.NORTH, BlockFace.WEST, BlockFace.SOUTH, BlockFace.UP, BlockFace.DOWN};
+ // Paper start - In addition to d65a2576e40e58c8e446b330febe6799d13a604f do not check UP/DOWN for non item frames
+ // BlockFace[] faces = new BlockFace[]{BlockFace.EAST, BlockFace.NORTH, BlockFace.WEST, BlockFace.SOUTH, BlockFace.UP, BlockFace.DOWN};
+ BlockFace[] faces = (ItemFrame.class.isAssignableFrom(clazz))
+ ? new BlockFace[]{BlockFace.EAST, BlockFace.NORTH, BlockFace.WEST, BlockFace.SOUTH, BlockFace.UP, BlockFace.DOWN}
+ : new BlockFace[]{BlockFace.EAST, BlockFace.NORTH, BlockFace.WEST, BlockFace.SOUTH};
+ // Paper end
final BlockPosition pos = new BlockPosition(x, y, z);
for (BlockFace dir : faces) {
IBlockData nmsBlock = world.getType(pos.shift(CraftBlock.blockFaceToNotch(dir)));