12051feb76
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 61d4b090 SPIGOT-5428: Better handling of some ItemMeta Spigot Changes: 047b6f86 SPIGOT-5421: Add separate trident despawn rate c1047ed9 SPIGOT-5445: Add log-villager-deaths option
47 lines
2.5 KiB
Diff
47 lines
2.5 KiB
Diff
From 9f486428618df2f388560f3141c62fe82262c626 Mon Sep 17 00:00:00 2001
|
|
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
|
|
index 2c20de281..64146effd 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -211,4 +211,19 @@ public class PaperWorldConfig {
|
|
private void allowLeashingUndeadHorse() {
|
|
allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
|
|
}
|
|
+
|
|
+ public int nonPlayerArrowDespawnRate = -1;
|
|
+ public int creativeArrowDespawnRate = -1;
|
|
+ private void nonPlayerArrowDespawnRate() {
|
|
+ nonPlayerArrowDespawnRate = getInt("non-player-arrow-despawn-rate", -1);
|
|
+ if (nonPlayerArrowDespawnRate == -1) {
|
|
+ nonPlayerArrowDespawnRate = spigotConfig.arrowDespawnRate;
|
|
+ }
|
|
+ creativeArrowDespawnRate = getInt("creative-arrow-despawn-rate", -1);
|
|
+ if (creativeArrowDespawnRate == -1) {
|
|
+ creativeArrowDespawnRate = spigotConfig.arrowDespawnRate;
|
|
+ }
|
|
+ log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate);
|
|
+ log("Creative Arrow Despawn Rate: " + creativeArrowDespawnRate);
|
|
+ }
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
|
|
index a9f843aad..2b14b2c3f 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityArrow.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
|
|
@@ -266,7 +266,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
|
|
|
|
protected void i() {
|
|
++this.despawnCounter;
|
|
- if (this.despawnCounter >= ((this instanceof EntityThrownTrident) ? world.spigotConfig.tridentDespawnRate : world.spigotConfig.arrowDespawnRate)) { // Spigot
|
|
+ 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?
|
|
this.die();
|
|
}
|
|
|
|
--
|
|
2.24.1
|
|
|