2021-03-15 23:00:00 +01:00
|
|
|
--- a/net/minecraft/world/level/block/BlockPumpkinCarved.java
|
|
|
|
|
+++ b/net/minecraft/world/level/block/BlockPumpkinCarved.java
|
2022-12-07 17:00:00 +01:00
|
|
|
@@ -26,6 +26,10 @@
|
2021-03-15 23:00:00 +01:00
|
|
|
import net.minecraft.world.level.block.state.properties.BlockStateDirection;
|
|
|
|
|
import net.minecraft.world.level.material.Material;
|
2018-07-15 02:00:00 +02:00
|
|
|
|
|
|
|
|
+// CraftBukkit start
|
|
|
|
|
+import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
|
|
|
|
|
+// CraftBukkit end
|
|
|
|
|
+
|
2020-06-25 02:00:00 +02:00
|
|
|
public class BlockPumpkinCarved extends BlockFacingHorizontal implements ItemWearable {
|
2018-07-15 02:00:00 +02:00
|
|
|
|
2021-06-11 07:00:00 +02:00
|
|
|
public static final BlockStateDirection FACING = BlockFacingHorizontal.FACING;
|
2022-12-07 17:00:00 +01:00
|
|
|
@@ -82,9 +86,14 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private static void spawnGolemInWorld(World world, ShapeDetector.ShapeDetectorCollection shapedetector_shapedetectorcollection, Entity entity, BlockPosition blockposition) {
|
|
|
|
|
- clearPatternBlocks(world, shapedetector_shapedetectorcollection);
|
|
|
|
|
+ // clearPatternBlocks(world, shapedetector_shapedetectorcollection); // CraftBukkit - moved down
|
|
|
|
|
entity.moveTo((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.05D, (double) blockposition.getZ() + 0.5D, 0.0F, 0.0F);
|
|
|
|
|
- world.addFreshEntity(entity);
|
|
|
|
|
+ // CraftBukkit start
|
|
|
|
|
+ if (!world.addFreshEntity(entity, SpawnReason.BUILD_IRONGOLEM)) {
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ clearPatternBlocks(world, shapedetector_shapedetectorcollection); // CraftBukkit - from above
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
Iterator iterator = world.getEntitiesOfClass(EntityPlayer.class, entity.getBoundingBox().inflate(5.0D)).iterator();
|
|
|
|
|
|
|
|
|
|
while (iterator.hasNext()) {
|
