Fix bug where no arrows ever despawn

This commit is contained in:
William Blake Galbreath
2020-07-01 21:05:07 -05:00
parent eed34befaa
commit 29c272d868

View File

@@ -1,4 +1,4 @@
From 90b7e35a44d65b660f29b35707c5fe508baf086e Mon Sep 17 00:00:00 2001
From 2d463d700f0ef3f803f4590b246f38371bcd21cb Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 21 Feb 2020 17:04:51 -0600
Subject: [PATCH] MC-125757 Fix - Always increment arrow despawn counter
@@ -8,7 +8,7 @@ Subject: [PATCH] MC-125757 Fix - Always increment arrow despawn counter
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index 6195a45e3..8ee76ca4b 100644
index 6195a45e3..ffa5ed69c 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 {
@@ -30,7 +30,7 @@ index 6195a45e3..8ee76ca4b 100644
}
+ protected void checkDespawnCounter() { i(); } // Purpur - OBFHELPER
+ protected void checkDespawnCounter() { h(); } // Purpur - OBFHELPER
protected void h() {
++this.despawnCounter;
if (this.despawnCounter >= (fromPlayer == PickupStatus.CREATIVE_ONLY ? world.paperConfig.creativeArrowDespawnRate : (fromPlayer == PickupStatus.DISALLOWED ? world.paperConfig.nonPlayerArrowDespawnRate : ((this instanceof EntityThrownTrident) ? world.spigotConfig.tridentDespawnRate : world.spigotConfig.arrowDespawnRate)))) { // Spigot // Paper - TODO: Extract this to init?