mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-05 10:20:53 +01:00
05466e3b47
Upstream has released updates that appear to apply compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing. Bukkit Changes: d2834556 SPIGOT-4219: Event for PigZombies angering. CraftBukkit Changes:a9c796f1SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations195f071eSPIGOT-4219: Event for PigZombies angering.5e3082c7SPIGOT-4230: Improve legacy block types
50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
From eb14acc9a6e994a5003d6f2650bbb85b0605d937 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Mon, 28 Mar 2016 20:46:14 -0400
|
|
Subject: [PATCH] Configurable Chunk Inhabited Timer
|
|
|
|
Vanilla stores how long a chunk has been active on a server, and dynamically scales some
|
|
aspects of vanilla gameplay to this factor.
|
|
|
|
For people who want all chunks to be treated equally, you can disable the timer.
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
index b3b3baddc0..613964ce04 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -222,4 +222,9 @@ public class PaperWorldConfig {
|
|
private void firePhysicsEventForRedstone() {
|
|
firePhysicsEventForRedstone = getBoolean("fire-physics-event-for-redstone", firePhysicsEventForRedstone);
|
|
}
|
|
+
|
|
+ public boolean useInhabitedTime = true;
|
|
+ private void useInhabitedTime() {
|
|
+ useInhabitedTime = getBoolean("use-chunk-inhabited-timer", true);
|
|
+ }
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
|
index 4b440c7077..e8a943cf74 100644
|
|
--- a/src/main/java/net/minecraft/server/Chunk.java
|
|
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
|
@@ -55,7 +55,7 @@ public class Chunk implements IChunkAccess {
|
|
private long lastSaved;
|
|
private boolean y;
|
|
private int z;
|
|
- private long A;
|
|
+ private long A; public long getInhabitedTime() { return A; } // Paper - OBFHELPER
|
|
private int B;
|
|
private final ConcurrentLinkedQueue<BlockPosition> C;
|
|
public boolean d;
|
|
@@ -1240,7 +1240,7 @@ public class Chunk implements IChunkAccess {
|
|
}
|
|
|
|
public long m() {
|
|
- return this.A;
|
|
+ return world.paperConfig.useInhabitedTime ? getInhabitedTime() : 0; // Paper
|
|
}
|
|
|
|
public void b(long i) {
|
|
--
|
|
2.18.0
|
|
|