mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 19:15:32 +01:00
4f7a858bd6
c2d29a73 PlayerElytraBoostEvent (BillyGalbreath)
* pull/1248/head:
PlayerElytraBoostEvent
Also merged paper config into parent
50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
From 3886acfd07271f1c99ec15a9751112ea7444500c 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 b3b3baddc..613964ce0 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 5d1812ab0..695c6d3b7 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;
|
|
@@ -1228,7 +1228,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
|
|
|