aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0392-Catch-exceptions-from-dispenser-entity-spawns.patch
diff options
context:
space:
mode:
Diffstat (limited to 'Spigot-Server-Patches/0392-Catch-exceptions-from-dispenser-entity-spawns.patch')
-rw-r--r--Spigot-Server-Patches/0392-Catch-exceptions-from-dispenser-entity-spawns.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0392-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0392-Catch-exceptions-from-dispenser-entity-spawns.patch
new file mode 100644
index 0000000000..335959bc28
--- /dev/null
+++ b/Spigot-Server-Patches/0392-Catch-exceptions-from-dispenser-entity-spawns.patch
@@ -0,0 +1,28 @@
+From a911f20edaee814e98234f9f00ab408520f5fa70 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <[email protected]>
+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 976c72208..fe3d9d5fa 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.23.0
+