34 lines
1.9 KiB
Diff
34 lines
1.9 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/Chunk.java b/src/main/java/net/minecraft/world/level/chunk/Chunk.java
|
||
|
|
index ac576d268b23148089d404cb22d8c2f9d1a79d6e..a2d80c2c8e4f080f60746548f75631c5946ba8e2 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/chunk/Chunk.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/chunk/Chunk.java
|
||
|
|
@@ -40,9 +40,11 @@ import net.minecraft.world.level.TickListChunk;
|
||
|
|
import net.minecraft.world.level.TickListEmpty;
|
||
|
|
import net.minecraft.world.level.World;
|
||
|
|
import net.minecraft.world.level.block.Block;
|
||
|
|
+import net.minecraft.world.level.block.BlockMobSpawner;
|
||
|
|
import net.minecraft.world.level.block.Blocks;
|
||
|
|
import net.minecraft.world.level.block.ITileEntity;
|
||
|
|
import net.minecraft.world.level.block.entity.TileEntity;
|
||
|
|
+import net.minecraft.world.level.block.entity.TileEntityMobSpawner;
|
||
|
|
import net.minecraft.world.level.block.state.IBlockData;
|
||
|
|
import net.minecraft.world.level.levelgen.ChunkProviderDebug;
|
||
|
|
import net.minecraft.world.level.levelgen.HeightMap;
|
||
|
|
@@ -648,6 +650,10 @@ public class Chunk implements IChunkAccess {
|
||
|
|
}
|
||
|
|
|
||
|
|
// CraftBukkit start
|
||
|
|
+ // Paper start - Remove invalid mob spawner tile entities
|
||
|
|
+ } else if (tileentity instanceof TileEntityMobSpawner && !(getBlockData(blockposition.getX(), blockposition.getY(), blockposition.getZ()).getBlock() instanceof BlockMobSpawner)) {
|
||
|
|
+ this.tileEntities.remove(blockposition);
|
||
|
|
+ // Paper end
|
||
|
|
} else {
|
||
|
|
System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.getPosition().getX() + "," + tileentity.getPosition().getY() + "," + tileentity.getPosition().getZ()
|
||
|
|
+ " (" + getType(blockposition) + ") where there was no entity tile!");
|