SPIGOT-7744: Fix crash when shooting arrows in creative mode

2024-06-13 20:53:57 -04:00 · 2024-06-13 20:53:57 -04:00 · 64e0ad1292
commit 64e0ad1292
parent 819f7a10aa
1 changed files with 9 additions and 3 deletions
--- a/nms-patches/net/minecraft/world/entity/projectile/EntityArrow.patch
+++ b/nms-patches/net/minecraft/world/entity/projectile/EntityArrow.patch
@ -83,8 +83,12 @@
         } else {
             this.firedFromWeapon = null;
         }
-@@ -630,17 +643,10 @@
-         EntityArrow.PickupStatus entityarrow_pickupstatus;
+@@ -627,34 +640,30 @@
+         Entity entity1 = entity;
+         byte b0 = 0;
+ 
+-        EntityArrow.PickupStatus entityarrow_pickupstatus;
+        EntityArrow.PickupStatus entityarrow_pickupstatus = this.pickup; // CraftBukkit - decompile error
 
         label16:
 -        while(true) {
@ -105,7 +109,9 @@
 
                     if (this.pickup != EntityArrow.PickupStatus.DISALLOWED) {
                         b0 = 1;
-@@ -649,12 +655,15 @@
+-                        break;
+                        break label16;
+                     }
 
                     entityarrow_pickupstatus = EntityArrow.PickupStatus.ALLOWED;
                     break label16;