From d041dc5744a8c53ce8ae8803331ed26d69c7b4b0 Mon Sep 17 00:00:00 2001 From: Aikar 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 index 57e1fcf..3f8a47b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -279,4 +279,13 @@ public class PaperWorldConfig { 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 index ccbf47e..b7ac5f7 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -149,7 +149,7 @@ public abstract class EntityArrow extends Entity implements IProjectile { if (block == this.aw && i == this.ax) { ++this.ay; - if (this.ay >= world.spigotConfig.arrowDespawnRate) { // Spigot - First int after shooter + if (this.ay >= (fromPlayer != PickupStatus.DISALLOWED ? world.spigotConfig.arrowDespawnRate : world.paperConfig.nonPlayerArrowDespawnRate)) { // Spigot - First int after shooter // Paper this.die(); } } else { -- 2.9.0