From 1498e34f2c49c2507ab7bb2ac1535d1b2d92c059 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Thu, 13 Jun 2024 20:53:57 -0400 Subject: [PATCH] SPIGOT-7744: Fix crash when shooting arrows in creative mode By: Doc --- .../world/entity/projectile/EntityArrow.patch | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityArrow.patch b/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityArrow.patch index 96356c9788..a8c38bc959 100644 --- a/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityArrow.patch +++ b/paper-server/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;