mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-21 07:09:21 +08:00
45 lines
2.6 KiB
Diff
45 lines
2.6 KiB
Diff
|
From 0000000000000000000000000000000000000000 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 3ac2ac3db9b1c271b3c21930bb13716669ff64d3..3c78d3234054ce2dc46ef77decb6adb0cbd10620 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -215,4 +215,19 @@ public class PaperWorldConfig {
|
||
|
|
private void nonPlayerEntitiesOnScoreboards() {
|
||
|
|
nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", 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/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
|
||
|
|
index 371fdcbf1f9c01f6a356393f6c3767511f230930..0dc5792d542658107c9c22c1f920986decd13920 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
|
||
|
|
@@ -281,7 +281,7 @@ public abstract class AbstractArrow extends Projectile {
|
||
|
|
|
||
|
|
protected void tickDespawn() {
|
||
|
|
++this.life;
|
||
|
|
- if (this.life >= ((this instanceof ThrownTrident) ? level.spigotConfig.tridentDespawnRate : level.spigotConfig.arrowDespawnRate)) { // Spigot
|
||
|
|
+ if (this.life >= (pickup == Pickup.CREATIVE_ONLY ? level.paperConfig.creativeArrowDespawnRate : (pickup == Pickup.DISALLOWED ? level.paperConfig.nonPlayerArrowDespawnRate : ((this instanceof ThrownTrident) ? level.spigotConfig.tridentDespawnRate : level.spigotConfig.arrowDespawnRate)))) { // Spigot // Paper - TODO: Extract this to init?
|
||
|
|
this.remove();
|
||
|
|
}
|
||
|
|
|