9
0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-22 08:29:22 +00:00

Update Paper

This commit is contained in:
violetc
2023-10-06 01:43:59 +08:00
parent efb37ffb20
commit 6859b3902f
18 changed files with 35 additions and 44 deletions

View File

@@ -784,20 +784,20 @@ index b66a7d4aab887309579154815a0d4abf9de506b0..e4d3f280b35d977f28233b1db1dc855c
}
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index 97a9ce438afc9094dca4a44cb25b37d5f88dcf43..330413408d8e3c69ca6f0725f810de2f4b00824c 100644
index a6f58b3457b7477015c5c6d969e7d83017dd3fa1..52ad7912737f5e9affa3bfef2af55e52da67c778 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -1,6 +1,5 @@
package io.papermc.paper.configuration;
-import co.aikar.timings.MinecraftTimings;
import io.papermc.paper.configuration.constraint.Constraint;
import com.mojang.logging.LogUtils;
import io.papermc.paper.configuration.constraint.Constraints;
import io.papermc.paper.configuration.type.IntOr;
@@ -104,7 +103,6 @@ public class GlobalConfiguration extends ConfigurationPart {
import io.papermc.paper.configuration.type.number.IntOr;
@@ -109,7 +108,6 @@ public class GlobalConfiguration extends ConfigurationPart {
@Override
public void postProcess() {
@PostProcess
private void postProcess() {
- MinecraftTimings.processConfig(this);
}
}
@@ -1400,7 +1400,7 @@ index 17b6925b46f8386dcfc561483693de516465ec12..950b9d4ef4a9cb0e3f2ff083d84f1ebb
gameprofilerfiller.pop();
this.chunkMap.tick();
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 868951dc21aff541765b1f58f08cdf3c47446d25..8d4d9af86f0d6e479607d69d6acfcc3dc04e7af9 100644
index 51d282b524b5249438f7744f7f0b1cc27b76470e..bcf652a6ea6d3d2c9d092d726a0e22b8cfc28646 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1,7 +1,6 @@