Paper-Old/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch

From a14eae789e9ae1476dc35c2b99a28e950f05d325 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/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 3de0f69758..e990445196 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -506,6 +506,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.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ()
                 + " (" + getType(blockposition) + ") where there was no entity tile!");
-- 
2.21.0
Update upstream & fix some chunk related issues (#2177) * Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes: 4090d01f SPIGOT-5047: Correct slot types for 1.14 inventories e8c08362 SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks. d445af3b SPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33 2019-06-14 04:27:40 +02:00			`From a14eae789e9ae1476dc35c2b99a28e950f05d325 Mon Sep 17 00:00:00 2001`
Paper 1.9 2016-03-01 00:09:49 +01:00			`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/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java`
Updated Upstream (CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI 0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason 2019-06-06 17:36:57 +02:00			`index 3de0f69758..e990445196 100644`
Paper 1.9 2016-03-01 00:09:49 +01:00			`--- a/src/main/java/net/minecraft/server/Chunk.java`
			`+++ b/src/main/java/net/minecraft/server/Chunk.java`
Move getTypeIfLoaded and friends to IBlockAccess (#2077) 2019-05-27 08:14:14 +02:00			`@@ -506,6 +506,10 @@ public class Chunk implements IChunkAccess {`
More work towards 1.14 pre5 2019-04-24 03:00:24 +02:00			`}`

Paper 1.9 2016-03-01 00:09:49 +01:00			`// CraftBukkit start`
			`+ // Paper start - Remove invalid mob spawner tile entities`
NOT FINISHED! even more 1.13-pre patches! 2018-07-16 22:08:09 +02:00			`+ } else if (tileentity instanceof TileEntityMobSpawner && !(getBlockData(blockposition.getX(), blockposition.getY(), blockposition.getZ()).getBlock() instanceof BlockMobSpawner)) {`
Paper 1.9 2016-03-01 00:09:49 +01:00			`+ this.tileEntities.remove(blockposition);`
			`+ // Paper end`
			`} else {`
			`System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ()`
NOT FINISHED!!! Current Progress on 1.13-pre7 update This work is 100% unfinished. I am pushing it up so that we as a team can work on this update. Do not try to use this branch. You will fail. 2018-07-15 03:53:17 +02:00			`+ " (" + getType(blockposition) + ") where there was no entity tile!");`
Paper 1.9 2016-03-01 00:09:49 +01:00			`--`
Numerous fixes to entity related changes While it wasn't really "broken" before, if plugins use NMS (which they really should't be) and mess with entity management themselves, and get it wrong, they could ultimately corrupt our state expectations. I've been unable to reproduce any issues locally, but these changes are the result of me analyzing the code pretty deeply and seeing about how to make it more durable to abnormal usage. Any servers seeing oddities, please run with -Ddebug.entities=true and send me any logs triggered. 2019-04-06 05:08:45 +02:00			`2.21.0`
Paper 1.9 2016-03-01 00:09:49 +01:00