From 93fe390461f1ac5dd182c48142d12f51b1f2bf96 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 8 Jul 2020 12:13:20 -0500 Subject: [PATCH] Upgrade MC-125757 fix :O --- ...ways-increment-arrow-despawn-counter.patch | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/patches/server/0030-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch b/patches/server/0030-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch index e55c995d2..e9b616ed4 100644 --- a/patches/server/0030-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch +++ b/patches/server/0030-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch @@ -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 { }