From 64e0ad1292c4e530f3639317446e430d780cc015 Mon Sep 17 00:00:00 2001
From: Doc <nachito94@msn.com>
Date: Thu, 13 Jun 2024 20:53:57 -0400
Subject: [PATCH] SPIGOT-7744: Fix crash when shooting arrows in creative mode

---
 .../world/entity/projectile/EntityArrow.patch        | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/nms-patches/net/minecraft/world/entity/projectile/EntityArrow.patch b/nms-patches/net/minecraft/world/entity/projectile/EntityArrow.patch
index 96356c978..a8c38bc95 100644
--- 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;