Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-7751: Fix crash caused by arrows from trial spawners

Browse Source
This commit is contained in:
Jishuna 2024-06-14 10:14:27 -04:00
parent a1d2cd1521
commit c23daa71f7
No known key found for this signature in database
GPG Key ID: 0497517C2A67E88E
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nms-patches/net/minecraft/world/entity/projectile/EntityArrow.patch
View File

@ -109,7 +109,7 @@
} else { } else {
this.firedFromWeapon = null; this.firedFromWeapon = null;
} }
@@ -627,34 +647,30 @@ @@ -627,34 +647,31 @@
Entity entity1 = entity; Entity entity1 = entity;
byte b0 = 0; byte b0 = 0;
@ -147,6 +147,7 @@
entityarrow_pickupstatus = EntityArrow.PickupStatus.DISALLOWED; entityarrow_pickupstatus = EntityArrow.PickupStatus.DISALLOWED;
break label16; break label16;
+ case null: // SPIGOT-7751: Fix crash caused by null owner
+ default: + default:
+ entityarrow_pickupstatus = this.pickup; + entityarrow_pickupstatus = this.pickup;
+ break label16; + break label16;
@ -155,7 +156,7 @@
} }
this.pickup = entityarrow_pickupstatus; this.pickup = entityarrow_pickupstatus;
@@ -663,9 +679,24 @@ @@ -663,9 +680,24 @@
@Override @Override
public void playerTouch(EntityHuman entityhuman) { public void playerTouch(EntityHuman entityhuman) {
if (!this.level().isClientSide && (this.inGround || this.isNoPhysics()) && this.shakeTime <= 0) { if (!this.level().isClientSide && (this.inGround || this.isNoPhysics()) && this.shakeTime <= 0) {