#1233: Remove some old MC bug fixes now fixed in vanilla

By: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
2023-07-24 18:09:23 +10:00
parent 06818793c7
commit e00c85fd8c
2 changed files with 1 additions and 21 deletions
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityDolphin.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityDolphin.patch
@@ -42,15 +42,6 @@
                 this.onItemPickup(entityitem);
                 this.setItemSlot(EnumItemSlot.MAINHAND, itemstack);
                 this.setGuaranteedDrop(EnumItemSlot.MAINHAND);
-@@ -389,7 +406,7 @@
- 
-         @Override
-         public boolean canUse() {
-            return this.dolphin.gotFish() && this.dolphin.getAirSupply() >= 100;
-+            return this.dolphin.gotFish() && this.dolphin.getAirSupply() >= 100 && this.dolphin.level().getWorld().canGenerateStructures(); // MC-151364, SPIGOT-5494: hangs if generate-structures=false
-         }
- 
-         @Override
@@ -489,7 +506,7 @@
 
         @Override