core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0031-Configurable-hanging-t...

39 lines
1.7 KiB
Diff
Raw Normal View History

Update from upstream SpigotMC Fix empty `ench` tags being wiped by the meta system SpigotMC/Spigot@cc9a1a417f1ac95a7957db8636e31c8fc2baf4e9 Add Hunger Config Values SpigotMC/Spigot@2cd515e2241947e3f9a11d6975c2d657360f7acd Make debug logging togglable SpigotMC/Spigot@d31b1d616fe2c16bd3609d6f632826e05bc505e9 Spigot has implemented a system of hunger exhaustion similar to ours, as such a lot of config values have been moved there. Our exhaustion patch has been trimmed and only a few values for exhaustion remain in paper.yml, the others now sit in spigot.yml
2014-08-17 21:47:36 +00:00
From b376680ab8cd0bd29566e11b7879db8b6cc83fed Mon Sep 17 00:00:00 2001
Configurable hanging tick EntityHangings make a somewhat extensive calculation ever 100 ticks to check if they should die (obstruction etc). This patch makes this magic number configurable, allowing server owners to pick how often they want EntityHangings (e.g. ItemFrames) to tick. Higher values may provide a performance boost for Hanging-heavy servers.
2014-08-09 22:27:35 +00:00
From: drXor <mcyoung@mit.edu>
Date: Sat, 9 Aug 2014 17:24:20 -0500
Subject: [PATCH] Configurable hanging tick
diff --git a/src/main/java/net/minecraft/server/EntityHanging.java b/src/main/java/net/minecraft/server/EntityHanging.java
index eec465b..3b6d152 100644
--- a/src/main/java/net/minecraft/server/EntityHanging.java
+++ b/src/main/java/net/minecraft/server/EntityHanging.java
@@ -102,7 +102,7 @@ public abstract class EntityHanging extends Entity {
this.lastX = this.locX;
this.lastY = this.locY;
this.lastZ = this.locZ;
- if (this.e++ == 100 && !this.world.isStatic) {
+ if (this.e++ == this.world.paperSpigotConfig.hangingTickFrequency && !this.world.isStatic) { // PaperSpigot - 100 -> this.world.paperSpigotConfig.hangingTickFrequency
this.e = 0;
if (!this.dead && !this.survives()) {
// CraftBukkit start - fire break events
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
Update from upstream SpigotMC Fix empty `ench` tags being wiped by the meta system SpigotMC/Spigot@cc9a1a417f1ac95a7957db8636e31c8fc2baf4e9 Add Hunger Config Values SpigotMC/Spigot@2cd515e2241947e3f9a11d6975c2d657360f7acd Make debug logging togglable SpigotMC/Spigot@d31b1d616fe2c16bd3609d6f632826e05bc505e9 Spigot has implemented a system of hunger exhaustion similar to ours, as such a lot of config values have been moved there. Our exhaustion patch has been trimmed and only a few values for exhaustion remain in paper.yml, the others now sit in spigot.yml
2014-08-17 21:47:36 +00:00
index ce3fb73..552a53c 100644
Configurable hanging tick EntityHangings make a somewhat extensive calculation ever 100 ticks to check if they should die (obstruction etc). This patch makes this magic number configurable, allowing server owners to pick how often they want EntityHangings (e.g. ItemFrames) to tick. Higher values may provide a performance boost for Hanging-heavy servers.
2014-08-09 22:27:35 +00:00
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
Update from upstream SpigotMC Fix empty `ench` tags being wiped by the meta system SpigotMC/Spigot@cc9a1a417f1ac95a7957db8636e31c8fc2baf4e9 Add Hunger Config Values SpigotMC/Spigot@2cd515e2241947e3f9a11d6975c2d657360f7acd Make debug logging togglable SpigotMC/Spigot@d31b1d616fe2c16bd3609d6f632826e05bc505e9 Spigot has implemented a system of hunger exhaustion similar to ours, as such a lot of config values have been moved there. Our exhaustion patch has been trimmed and only a few values for exhaustion remain in paper.yml, the others now sit in spigot.yml
2014-08-17 21:47:36 +00:00
@@ -171,4 +171,11 @@ public class PaperSpigotWorldConfig
Configurable hanging tick EntityHangings make a somewhat extensive calculation ever 100 ticks to check if they should die (obstruction etc). This patch makes this magic number configurable, allowing server owners to pick how often they want EntityHangings (e.g. ItemFrames) to tick. Higher values may provide a performance boost for Hanging-heavy servers.
2014-08-09 22:27:35 +00:00
waterOverLavaFlowSpeed = getInt( "water-over-lava-flow-speed", 5 );
log( "Water over lava flow speed: " + waterOverLavaFlowSpeed);
}
+
+ public int hangingTickFrequency;
+ private void hangingTickSpeed()
+ {
+ hangingTickFrequency = getInt( "hanging-tick-frequency", 100);
+ log( "Hanging entities tick frequency: " + hangingTickFrequency);
+ }
}
--
1.9.1