Paper-Old/Spigot-Server-Patches/0402-Catch-exceptions-from-dispenser-entity-spawns.patch

From 4e86aa51295c1ba141e82ac79407c460ea1dfc19 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 10 Jun 2019 09:36:40 +0100
Subject: [PATCH] Catch exceptions from dispenser entity spawns


diff --git a/src/main/java/net/minecraft/server/IDispenseBehavior.java b/src/main/java/net/minecraft/server/IDispenseBehavior.java
index 60442e4b8a..1874b5d252 100644
--- a/src/main/java/net/minecraft/server/IDispenseBehavior.java
+++ b/src/main/java/net/minecraft/server/IDispenseBehavior.java
@@ -163,7 +163,14 @@ public interface IDispenseBehavior {
                     }
                 }
 
+                try { // Paper
                 entitytypes.spawnCreature(isourceblock.getWorld(), itemstack, (EntityHuman) null, isourceblock.getBlockPosition().shift(enumdirection), EnumMobSpawn.DISPENSER, enumdirection != EnumDirection.UP, false);
+                    // Paper start
+                } catch (Exception ex){
+                    MinecraftServer.LOGGER.warn("An exception occurred dispensing entity at {}[{}]", world.getWorld().getName(), isourceblock.getBlockPosition(), ex);
+                }
+                // Paper end
+
                 // itemstack.subtract(1); // Handled during event processing
                 // CraftBukkit end
                 return itemstack;
-- 
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 4e86aa51295c1ba141e82ac79407c460ea1dfc19 Mon Sep 17 00:00:00 2001`
Merge branch 'master' into ver/1.14 2019-06-10 11:11:29 +02:00			`From: Shane Freeder <theboyetronic@gmail.com>`
			`Date: Mon, 10 Jun 2019 09:36:40 +0100`
			`Subject: [PATCH] Catch exceptions from dispenser entity spawns`


			`diff --git a/src/main/java/net/minecraft/server/IDispenseBehavior.java b/src/main/java/net/minecraft/server/IDispenseBehavior.java`
			`index 60442e4b8a..1874b5d252 100644`
			`--- a/src/main/java/net/minecraft/server/IDispenseBehavior.java`
			`+++ b/src/main/java/net/minecraft/server/IDispenseBehavior.java`
			`@@ -163,7 +163,14 @@ public interface IDispenseBehavior {`
			`}`
			`}`

			`+ try { // Paper`
			`entitytypes.spawnCreature(isourceblock.getWorld(), itemstack, (EntityHuman) null, isourceblock.getBlockPosition().shift(enumdirection), EnumMobSpawn.DISPENSER, enumdirection != EnumDirection.UP, false);`
			`+ // Paper start`
			`+ } catch (Exception ex){`
			`+ MinecraftServer.LOGGER.warn("An exception occurred dispensing entity at {}[{}]", world.getWorld().getName(), isourceblock.getBlockPosition(), ex);`
			`+ }`
			`+ // Paper end`
			`+`
			`// itemstack.subtract(1); // Handled during event processing`
			`// CraftBukkit end`
			`return itemstack;`
			`--`
			`2.21.0`