2019-06-14 02:27:40 +00:00
|
|
|
From 4e86aa51295c1ba141e82ac79407c460ea1dfc19 Mon Sep 17 00:00:00 2001
|
2019-06-10 09:11:29 +00: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
|
|
|
|
|
|
