2017-03-25 04:18:58 +01:00
From 0f7207a38a3d9ac2b2c0a62696792a6c35256cc1 Mon Sep 17 00:00:00 2001
2016-03-18 20:13:03 +01: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
2017-03-25 04:18:58 +01:00
index 0873febb6..b37b5901b 100644
2016-03-18 20:13:03 +01:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
2017-03-25 04:18:58 +01:00
@@ -254,4 +254,13 @@ public class PaperWorldConfig {
2016-03-18 20:13:03 +01:00
private void allowLeashingUndeadHorse() {
allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
}
+
+ public int nonPlayerArrowDespawnRate = -1;
+ private void nonPlayerArrowDespawnRate() {
+ nonPlayerArrowDespawnRate = getInt("non-player-arrow-despawn-rate", -1);
+ if (nonPlayerArrowDespawnRate == -1) {
+ nonPlayerArrowDespawnRate = spigotConfig.arrowDespawnRate;
+ }
+ log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate);
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
2017-03-25 04:18:58 +01:00
index 65689f26d..8cda47518 100644
2016-03-18 20:13:03 +01:00
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
2016-11-17 03:23:38 +01:00
@@ -157,7 +157,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
this.ay = 0;
} else {
++this.ax;
- if (this.ax >= world.spigotConfig.arrowDespawnRate) { // Spigot - First int after shooter
+ if (this.ax >= (fromPlayer != PickupStatus.DISALLOWED ? world.spigotConfig.arrowDespawnRate : world.paperConfig.nonPlayerArrowDespawnRate)) { // Spigot - First int after shooter // Paper
2016-03-18 20:13:03 +01:00
this.die();
}
2016-11-17 03:23:38 +01:00
}
2016-03-18 20:13:03 +01:00
--
2017-03-25 04:18:58 +01:00
2.12.0.windows.1
2016-03-18 20:13:03 +01:00