From 9820cd2db026c6d05728da2e95f42d8ad70f6db3 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 3 Jan 2020 16:56:58 +1100 Subject: [PATCH] MC-151364, SPIGOT-5494: Feeding dolphin hangs if generate-structures=false --- nms-patches/EntityDolphin.patch | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nms-patches/EntityDolphin.patch b/nms-patches/EntityDolphin.patch index ebf3f33b9b..da1c477545 100644 --- a/nms-patches/EntityDolphin.patch +++ b/nms-patches/EntityDolphin.patch @@ -21,6 +21,15 @@ this.setSlot(EnumItemSlot.MAINHAND, itemstack); this.dropChanceHand[EnumItemSlot.MAINHAND.b()] = 2.0F; this.receive(entityitem, itemstack.getCount()); +@@ -317,7 +322,7 @@ + + @Override + public boolean a() { +- return this.a.eq() && this.a.getAirTicks() >= 100; ++ return this.a.eq() && this.a.getAirTicks() >= 100 && this.a.world.getWorld().canGenerateStructures(); // MC-151364, SPIGOT-5494: hangs if generate-structures=false + } + + @Override @@ -425,7 +430,7 @@ @Override