1 files changed, 50 insertions, 0 deletions
diff --git a/patch-remap/og/net/minecraft/world/level/block/BlockWitherSkull.patch b/patch-remap/og/net/minecraft/world/level/block/BlockWitherSkull.patch
new file mode 100644
index 0000000000..40c507d61c
--- /dev/null
+++ b/patch-remap/og/net/minecraft/world/level/block/BlockWitherSkull.patch
@@ -0,0 +1,50 @@
+--- a/net/minecraft/world/level/block/BlockWitherSkull.java
++++ b/net/minecraft/world/level/block/BlockWitherSkull.java
+@@ -25,6 +25,10 @@
+ import net.minecraft.world.level.block.state.pattern.ShapeDetectorBuilder;
+ import net.minecraft.world.level.block.state.predicate.BlockStatePredicate;
+ 
++// CraftBukkit start
++import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
++// CraftBukkit end
++
+ public class BlockWitherSkull extends BlockSkull {
+ 
+     public static final MapCodec<BlockWitherSkull> CODEC = simpleCodec(BlockWitherSkull::new);
+@@ -54,6 +58,7 @@
+     }
+ 
+     public static void checkSpawn(World world, BlockPosition blockposition, TileEntitySkull tileentityskull) {
++        if (world.captureBlockStates) return; // CraftBukkit
+         if (!world.isClientSide) {
+             IBlockData iblockdata = tileentityskull.getBlockState();
+             boolean flag = iblockdata.is(Blocks.WITHER_SKELETON_SKULL) || iblockdata.is(Blocks.WITHER_SKELETON_WALL_SKULL);
+@@ -65,12 +70,18 @@
+                     EntityWither entitywither = (EntityWither) EntityTypes.WITHER.create(world);
+ 
+                     if (entitywither != null) {
+-                        BlockPumpkinCarved.clearPatternBlocks(world, shapedetector_shapedetectorcollection);
++                        // BlockPumpkinCarved.clearPatternBlocks(world, shapedetector_shapedetectorcollection); // CraftBukkit - move down
+                         BlockPosition blockposition1 = shapedetector_shapedetectorcollection.getBlock(1, 2, 0).getPos();
+ 
+                         entitywither.moveTo((double) blockposition1.getX() + 0.5D, (double) blockposition1.getY() + 0.55D, (double) blockposition1.getZ() + 0.5D, shapedetector_shapedetectorcollection.getForwards().getAxis() == EnumDirection.EnumAxis.X ? 0.0F : 90.0F, 0.0F);
+                         entitywither.yBodyRot = shapedetector_shapedetectorcollection.getForwards().getAxis() == EnumDirection.EnumAxis.X ? 0.0F : 90.0F;
+                         entitywither.makeInvulnerable();
++                        // CraftBukkit start
++                        if (!world.addFreshEntity(entitywither, SpawnReason.BUILD_WITHER)) {
++                            return;
++                        }
++                        BlockPumpkinCarved.clearPatternBlocks(world, shapedetector_shapedetectorcollection); // CraftBukkit - from above
++                        // CraftBukkit end
+                         Iterator iterator = world.getEntitiesOfClass(EntityPlayer.class, entitywither.getBoundingBox().inflate(50.0D)).iterator();
+ 
+                         while (iterator.hasNext()) {
+@@ -79,7 +90,7 @@
+                             CriterionTriggers.SUMMONED_ENTITY.trigger(entityplayer, (Entity) entitywither);
+                         }
+ 
+-                        world.addFreshEntity(entitywither);
++                        // world.addFreshEntity(entitywither); // CraftBukkit - moved up
+                         BlockPumpkinCarved.updatePatternBlocks(world, shapedetector_shapedetectorcollection);
+                     }
+