mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 02:17:42 +01:00
40 lines
1.7 KiB
Diff
40 lines
1.7 KiB
Diff
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
|
|
|
|
---
|
|
src/main/java/net/minecraft/server/EntityArrow.java | 5 ++++-
|
|
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..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 {
|
|
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
|
|
}
|
|
|
|
++this.c;
|
|
@@ -254,6 +256,7 @@ public abstract class EntityArrow extends IProjectile {
|
|
|
|
}
|
|
|
|
+ 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?
|
|
--
|
|
2.26.2
|
|
|