From 0c4d3daad8180e670e800360fe2f25d15f79b544 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 19 Aug 2014 14:51:28 -0500 Subject: [PATCH] Remove invalid mob spawner tile entities diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java index 0423ee9..9454d4f 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -755,6 +755,11 @@ public class Chunk { this.world.triggerHoppersList.add(tileentity); } // Spigot end + // PaperSpigot start - Remove invalid mob spawner Tile Entities + } else if (this.world.paperSpigotConfig.removeInvalidMobSpawnerTEs && tileentity instanceof TileEntityMobSpawner && + org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(getType(i, j, k)) != org.bukkit.Material.MOB_SPAWNER) { + this.tileEntities.remove(chunkposition); + // PaperSpigot end // CraftBukkit start } else { System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.x + "," + tileentity.y + "," + tileentity.z diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java index ce3fb73..753bdda 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java @@ -171,4 +171,11 @@ public class PaperSpigotWorldConfig waterOverLavaFlowSpeed = getInt( "water-over-lava-flow-speed", 5 ); log( "Water over lava flow speed: " + waterOverLavaFlowSpeed); } + + public boolean removeInvalidMobSpawnerTEs; + private void removeInvalidMobSpawnerTEs() + { + removeInvalidMobSpawnerTEs = getBoolean( "remove-invalid-mob-spawner-tile-entities", true); + log( "Remove invalid mob spawner tile entities: " + removeInvalidMobSpawnerTEs ); + } } -- 1.9.1