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

50 lines
2.0 KiB
Diff
Raw Normal View History

Update upstream B/CB/S Adds /paper command for reloading the paper config. Closes GH-639 Per-world config logging has been removed in favor of all or nothing logging for all paper settings. I don't believe it was used enough to warrant maintaining. If this is not the case it should be possible to re-add it.
2017-03-25 03:18:58 +00:00
From 07032dd31eb190fc5371f1b47a699d67e18597b4 Mon Sep 17 00:00:00 2001
Paper 1.9
2016-02-29 23:09:49 +00:00
From: Sudzzy <originmc@outlook.com>
Date: Wed, 2 Mar 2016 23:34:44 -0600
Subject: [PATCH] Configurable container update tick rate
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
Update upstream B/CB/S Adds /paper command for reloading the paper config. Closes GH-639 Per-world config logging has been removed in favor of all or nothing logging for all paper settings. I don't believe it was used enough to warrant maintaining. If this is not the case it should be possible to re-add it.
2017-03-25 03:18:58 +00:00
index 1bb956515..e6aae7317 100644
Paper 1.9
2016-02-29 23:09:49 +00:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
Update upstream B/CB/S Adds /paper command for reloading the paper config. Closes GH-639 Per-world config logging has been removed in favor of all or nothing logging for all paper settings. I don't believe it was used enough to warrant maintaining. If this is not the case it should be possible to re-add it.
2017-03-25 03:18:58 +00:00
@@ -219,4 +219,9 @@ public class PaperWorldConfig {
Paper 1.9.4 Update
2016-05-12 02:07:46 +00:00
private void mobSpawnerTickRate() {
mobSpawnerTickRate = getInt("mob-spawner-tick-rate", 1);
Paper 1.9
2016-02-29 23:09:49 +00:00
}
+
+ public int containerUpdateTickRate;
+ private void containerUpdateTickRate() {
+ containerUpdateTickRate = getInt("container-update-tick-rate", 1);
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
Update upstream B/CB/S Adds /paper command for reloading the paper config. Closes GH-639 Per-world config logging has been removed in favor of all or nothing logging for all paper settings. I don't believe it was used enough to warrant maintaining. If this is not the case it should be possible to re-add it.
2017-03-25 03:18:58 +00:00
index 485e1c3c7..d0e1de48a 100644
Paper 1.9
2016-02-29 23:09:49 +00:00
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
Update upstream B/CB
2017-01-14 08:11:12 +00:00
@@ -66,6 +66,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
Fix Player View Distance API corrupting Chunk Sending - Fixes #207 The Player View Distance patch has been screwing with the configured world view distance. The world a player was created in would set the players view distance, which would be locked to that distance. Then switching worlds would not give you an updated view distance. This then caused issues with what view distance the player should have in the chunk map and did not send chunks to the client correctly during movement. This patch has now been changed to use a -1 default for "default" and will not override view distance until someone has actually used the API to change it.
2016-04-24 01:39:22 +00:00
this.viewDistance = viewDistance;
}
// Paper end
Paper 1.9
2016-02-29 23:09:49 +00:00
+ private int containerUpdateDelay; // Paper
// CraftBukkit start
public String displayName;
Update upstream B/CB
2017-01-14 08:11:12 +00:00
@@ -228,7 +229,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
Paper 1.9
2016-02-29 23:09:49 +00:00
--this.noDamageTicks;
}
- this.activeContainer.b();
+ // Paper start - Configurable container update tick rate
+ if (--containerUpdateDelay <= 0) {
+ this.activeContainer.b();
+ containerUpdateDelay = world.paperConfig.containerUpdateTickRate;
+ }
+ // Paper end
if (!this.world.isClientSide && !this.activeContainer.a((EntityHuman) this)) {
this.closeInventory();
this.activeContainer = this.defaultContainer;
--
Update upstream B/CB/S Adds /paper command for reloading the paper config. Closes GH-639 Per-world config logging has been removed in favor of all or nothing logging for all paper settings. I don't believe it was used enough to warrant maintaining. If this is not the case it should be possible to re-add it.
2017-03-25 03:18:58 +00:00
2.12.0.windows.1
Paper 1.9
2016-02-29 23:09:49 +00:00