32 lines
1.8 KiB
Diff
32 lines
1.8 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Byteflux <byte@byteflux.net>
|
||
|
|
Date: Tue, 1 Mar 2016 15:08:03 -0600
|
||
|
|
Subject: [PATCH] Remove invalid mob spawner tile entities
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
|
||
|
|
index f30793b81dfd9018b4879d655c7c18a9f9c25267..300749822d52f9f973e71c6ec9c8bf29d6a6938e 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
|
||
|
|
@@ -41,7 +41,9 @@ import net.minecraft.world.level.TickList;
|
||
|
|
import net.minecraft.world.level.block.Block;
|
||
|
|
import net.minecraft.world.level.block.Blocks;
|
||
|
|
import net.minecraft.world.level.block.EntityBlock;
|
||
|
|
+import net.minecraft.world.level.block.SpawnerBlock;
|
||
|
|
import net.minecraft.world.level.block.entity.BlockEntity;
|
||
|
|
+import net.minecraft.world.level.block.entity.SpawnerBlockEntity;
|
||
|
|
import net.minecraft.world.level.block.state.BlockState;
|
||
|
|
import net.minecraft.world.level.levelgen.DebugLevelSource;
|
||
|
|
import net.minecraft.world.level.levelgen.Heightmap;
|
||
|
|
@@ -647,6 +649,10 @@ public class LevelChunk implements ChunkAccess {
|
||
|
|
}
|
||
|
|
|
||
|
|
// CraftBukkit start
|
||
|
|
+ // Paper start - Remove invalid mob spawner tile entities
|
||
|
|
+ } else if (blockEntity instanceof SpawnerBlockEntity && !(getBlockData(pos.getX(), pos.getY(), pos.getZ()).getBlock() instanceof SpawnerBlock)) {
|
||
|
|
+ this.blockEntities.remove(pos);
|
||
|
|
+ // Paper end
|
||
|
|
} else {
|
||
|
|
System.out.println("Attempted to place a tile entity (" + blockEntity + ") at " + blockEntity.getBlockPos().getX() + "," + blockEntity.getBlockPos().getY() + "," + blockEntity.getBlockPos().getZ()
|
||
|
|
+ " (" + getBlockState(pos) + ") where there was no entity tile!");
|