Upgrade MC-125757 fix :O

This commit is contained in:
William Blake Galbreath
2020-07-08 12:13:20 -05:00
parent 53f78c8ec1
commit 93fe390461

View File

@@ -5,25 +5,18 @@ Subject: [PATCH] MC-125757 Fix - Always increment arrow despawn counter
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index 6195a45e3..ffa5ed69c 100644
index 6195a45e30..962a558070 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -124,11 +124,13 @@ public abstract class EntityArrow extends IProjectile {
this.extinguish();
}
+ this.checkDespawnCounter(); // Purpur - moved from below - MC-125757
+
if (this.inGround && !flag) {
if (this.an != iblockdata && this.u()) {
this.z();
} else if (!this.world.isClientSide) {
- this.h();
+ // this.h(); // Purpur - moved up MC-125757
}
@@ -133,6 +133,7 @@ public abstract class EntityArrow extends IProjectile {
++this.c;
@@ -254,6 +256,7 @@ public abstract class EntityArrow extends IProjectile {
} else {
+ if (ticksLived > 200) this.checkDespawnCounter(); // Purpur - tick despawn counter after 10 seconds. fixes MC-125757
this.c = 0;
Vec3D vec3d2 = this.getPositionVector();
@@ -254,6 +255,7 @@ public abstract class EntityArrow extends IProjectile {
}