2019-04-26 01:24:00 +00:00
|
|
|
From cf9d4765f9a0d62dc30e80f49f03bdc67c590c8c Mon Sep 17 00:00:00 2001
|
2016-03-18 19:13:03 +00:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Fri, 18 Mar 2016 15:12:22 -0400
|
|
|
|
Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
|
|
|
|
|
|
|
|
Can set a much shorter despawn rate for arrows that players can not pick up.
|
|
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2019-04-26 01:24:00 +00:00
|
|
|
index 89556dc94a..98049567f4 100644
|
2016-03-18 19:13:03 +00:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2019-04-26 01:24:00 +00:00
|
|
|
@@ -206,4 +206,19 @@ public class PaperWorldConfig {
|
2016-03-18 19:13:03 +00:00
|
|
|
private void allowLeashingUndeadHorse() {
|
|
|
|
allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public int nonPlayerArrowDespawnRate = -1;
|
2018-09-23 02:48:30 +00:00
|
|
|
+ public int creativeArrowDespawnRate = -1;
|
2016-03-18 19:13:03 +00:00
|
|
|
+ private void nonPlayerArrowDespawnRate() {
|
|
|
|
+ nonPlayerArrowDespawnRate = getInt("non-player-arrow-despawn-rate", -1);
|
|
|
|
+ if (nonPlayerArrowDespawnRate == -1) {
|
|
|
|
+ nonPlayerArrowDespawnRate = spigotConfig.arrowDespawnRate;
|
|
|
|
+ }
|
2018-09-23 02:48:30 +00:00
|
|
|
+ creativeArrowDespawnRate = getInt("creative-arrow-despawn-rate", -1);
|
|
|
|
+ if (creativeArrowDespawnRate == -1) {
|
|
|
|
+ creativeArrowDespawnRate = spigotConfig.arrowDespawnRate;
|
|
|
|
+ }
|
2016-03-18 19:13:03 +00:00
|
|
|
+ log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate);
|
2018-09-23 02:48:30 +00:00
|
|
|
+ log("Creative Arrow Despawn Rate: " + creativeArrowDespawnRate);
|
2016-03-18 19:13:03 +00:00
|
|
|
+ }
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
|
2019-04-26 01:24:00 +00:00
|
|
|
index bc391812d3..b5b569ef95 100644
|
2016-03-18 19:13:03 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityArrow.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
|
2019-04-26 01:24:00 +00:00
|
|
|
@@ -263,7 +263,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
|
2018-07-15 01:53:17 +00:00
|
|
|
|
2019-04-26 01:24:00 +00:00
|
|
|
protected void i() {
|
2018-07-15 01:53:17 +00:00
|
|
|
++this.despawnCounter;
|
|
|
|
- if (this.despawnCounter >= world.spigotConfig.arrowDespawnRate) { // Spigot
|
2018-09-23 02:48:30 +00:00
|
|
|
+ if (this.despawnCounter >= (fromPlayer == PickupStatus.CREATIVE_ONLY ? world.paperConfig.creativeArrowDespawnRate : (fromPlayer == PickupStatus.DISALLOWED ? world.paperConfig.nonPlayerArrowDespawnRate : world.spigotConfig.arrowDespawnRate))) { // Spigot // Paper
|
2018-07-15 01:53:17 +00:00
|
|
|
this.die();
|
|
|
|
}
|
|
|
|
|
2016-03-18 19:13:03 +00:00
|
|
|
--
|
2019-04-05 04:52:02 +00:00
|
|
|
2.21.0
|
2016-03-18 19:13:03 +00:00
|
|
|
|