Skip to content

Commit 89ca94a

Browse files
lynxplaylynxplay
committed
[ci skip] Rebuild patches
1 parent af1823d commit 89ca94a

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

‎paper-server/patches/features/0001-Moonrise-optimisation-patches.patch‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23030,7 +23030,7 @@ index 13424bce076493f146bdc5fd0b1f2e09805bd5e7..2de7072c8ccc005e514673bba494b64d
2303023030
thread1 -> {
2303123031
DedicatedServer dedicatedServer1 = new DedicatedServer(
2303223032
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
23033-
index 869c0c2efd827baa7bc3decbcb16b5eacf92c5a5..952735ffc6f6c29029766754e0341e6d9078476b 100644
23033+
index 61e4ddb9665fb3bc4900c865ad8887d344ff7f7c..8afe24c382e18e799101662ccf87022e627770ed 100644
2303423034
--- a/net/minecraft/server/MinecraftServer.java
2303523035
+++ b/net/minecraft/server/MinecraftServer.java
2303623036
@@ -177,7 +177,7 @@ import net.minecraft.world.phys.Vec2;
@@ -23042,7 +23042,7 @@ index 869c0c2efd827baa7bc3decbcb16b5eacf92c5a5..952735ffc6f6c29029766754e0341e6d
2304223042
private static MinecraftServer SERVER; // Paper
2304323043
public static final Logger LOGGER = LogUtils.getLogger();
2304423044
public static final net.kyori.adventure.text.logger.slf4j.ComponentLogger COMPONENT_LOGGER = net.kyori.adventure.text.logger.slf4j.ComponentLogger.logger(LOGGER.getName()); // Paper
23045-
@@ -375,6 +375,93 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
23045+
@@ -392,6 +392,93 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2304623046
return minecraftServer;
2304723047
}
2304823048

@@ -23136,7 +23136,7 @@ index 869c0c2efd827baa7bc3decbcb16b5eacf92c5a5..952735ffc6f6c29029766754e0341e6d
2313623136
public MinecraftServer(
2313723137
// CraftBukkit start
2313823138
joptsimple.OptionSet options,
23139-
@@ -807,7 +894,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
23139+
@@ -824,7 +911,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2314023140
serverLevel.setSpawnSettings(serverLevel.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && serverLevel.getGameRules().getBoolean(GameRules.RULE_SPAWN_MONSTERS)); // Paper - per level difficulty (from setDifficulty(ServerLevel, Difficulty, boolean))
2314123141
this.updateEffectiveRespawnData();
2314223142
this.forceTicks = false; // CraftBukkit
@@ -23145,7 +23145,7 @@ index 869c0c2efd827baa7bc3decbcb16b5eacf92c5a5..952735ffc6f6c29029766754e0341e6d
2314523145
new org.bukkit.event.world.WorldLoadEvent(serverLevel.getWorld()).callEvent(); // Paper - call WorldLoadEvent
2314623146
}
2314723147

23148-
@@ -830,6 +917,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
23148+
@@ -847,6 +934,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2314923149
public abstract boolean shouldRconBroadcast();
2315023150

2315123151
public boolean saveAllChunks(boolean suppressLogs, boolean flush, boolean force) {
@@ -23157,7 +23157,7 @@ index 869c0c2efd827baa7bc3decbcb16b5eacf92c5a5..952735ffc6f6c29029766754e0341e6d
2315723157
boolean flag = false;
2315823158

2315923159
for (ServerLevel serverLevel : this.getAllLevels()) {
23160-
@@ -837,7 +929,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
23160+
@@ -854,7 +946,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2316123161
LOGGER.info("Saving chunks for level '{}'/{}", serverLevel, serverLevel.dimension().location());
2316223162
}
2316323163

@@ -23166,7 +23166,7 @@ index 869c0c2efd827baa7bc3decbcb16b5eacf92c5a5..952735ffc6f6c29029766754e0341e6d
2316623166
flag = true;
2316723167
}
2316823168

23169-
@@ -927,7 +1019,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
23169+
@@ -944,7 +1036,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2317023170
}
2317123171
}
2317223172

@@ -23175,7 +23175,7 @@ index 869c0c2efd827baa7bc3decbcb16b5eacf92c5a5..952735ffc6f6c29029766754e0341e6d
2317523175
this.nextTickTimeNanos = Util.getNanos() + TimeUtil.NANOSECONDS_PER_MILLISECOND;
2317623176

2317723177
for (ServerLevel serverLevelx : this.getAllLevels()) {
23178-
@@ -937,18 +1029,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
23178+
@@ -954,18 +1046,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2317923179

2318023180
this.waitUntilNextTick();
2318123181
}
@@ -23201,7 +23201,7 @@ index 869c0c2efd827baa7bc3decbcb16b5eacf92c5a5..952735ffc6f6c29029766754e0341e6d
2320123201

2320223202
this.isSaving = false;
2320323203
this.resources.close();
23204-
@@ -968,6 +1056,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
23204+
@@ -985,6 +1073,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2320523205
this.services().nameToIdCache().save(false); // Paper - Perf: Async GameProfileCache saving
2320623206
}
2320723207
// Spigot end
@@ -23216,7 +23216,7 @@ index 869c0c2efd827baa7bc3decbcb16b5eacf92c5a5..952735ffc6f6c29029766754e0341e6d
2321623216
// Paper start - Improved watchdog support - move final shutdown items here
2321723217
Util.shutdownExecutors();
2321823218
try {
23219-
@@ -1060,16 +1156,31 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
23219+
@@ -1077,16 +1173,31 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2322023220
// execute small amounts of other tasks just in case the number of tasks we are
2322123221
// draining is large - chunk system and packet processing may be latency sensitive
2322223222

@@ -23251,7 +23251,7 @@ index 869c0c2efd827baa7bc3decbcb16b5eacf92c5a5..952735ffc6f6c29029766754e0341e6d
2325123251
profiler.pop(); // moonrise:run_all_chunk
2325223252
profiler.pop(); // moonrise:run_all_tasks
2325323253

23254-
@@ -1210,11 +1321,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
23254+
@@ -1227,11 +1338,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2325523255
ProfilerFiller profilerFiller = Profiler.get();
2325623256
profilerFiller.push("tick");
2325723257
this.tickFrame.start();
@@ -23270,15 +23270,15 @@ index 869c0c2efd827baa7bc3decbcb16b5eacf92c5a5..952735ffc6f6c29029766754e0341e6d
2327023270
this.tickFrame.end();
2327123271
this.recordEndOfTick(); // Paper - improve tick loop
2327223272
profilerFiller.popPush("nextTickWait");
23273-
@@ -1387,6 +1502,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
23273+
@@ -1404,6 +1519,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2327423274

2327523275
private boolean pollTaskInternal() {
2327623276
if (super.pollTask()) {
2327723277
+ this.moonrise$executeMidTickTasks(); // Paper - rewrite chunk system
2327823278
return true;
2327923279
} else {
2328023280
boolean ret = false; // Paper - force execution of all worlds, do not just bias the first
23281-
@@ -2562,6 +2678,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
23281+
@@ -2579,6 +2695,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2328223282
}
2328323283
}
2328423284

@@ -28098,7 +28098,7 @@ index 8cc5c0716392ba06501542ff5cbe71ee43979e5d..09fd99c9cbd23b5f3c899bfb00c9b896
2809828098
+ // Paper end - block counting
2809928099
}
2810028100
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
28101-
index 639833862eff8d0bd231133b4943a1baf1aa019d..c5d45f86eda48ee18986c4198b96d031b8028bb2 100644
28101+
index 86d3cd1dc2a866e078e449f077c9ea1a852fcd98..7eda7cb9e7030e31279a94b0c1087e800f025b46 100644
2810228102
--- a/net/minecraft/world/entity/Entity.java
2810328103
+++ b/net/minecraft/world/entity/Entity.java
2810428104
@@ -149,7 +149,7 @@ import net.minecraft.world.waypoints.WaypointTransmitter;

‎paper-server/patches/features/0002-Rewrite-dataconverter-system.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32910,10 +32910,10 @@ index 71b8bbeda2fecf930870a9b6e856e20639d31645..91650a92a21fcaac65a5dfcac0cc856b
3291032910
return structureTemplate.save(new CompoundTag());
3291132911
}
3291232912
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
32913-
index 87b890fe94d1017b3e7717e062c5f901533e2aed..7fd37ef5e6403b6ee37b0b998d1546b3cc29e821 100644
32913+
index 8afe24c382e18e799101662ccf87022e627770ed..a31ef450a0c8f2929065a3c10e47c14bf5eb30f2 100644
3291432914
--- a/net/minecraft/server/MinecraftServer.java
3291532915
+++ b/net/minecraft/server/MinecraftServer.java
32916-
@@ -361,6 +361,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
32916+
@@ -378,6 +378,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
3291732917
// Paper end - improve tick loop
3291832918

3291932919
public static <S extends MinecraftServer> S spin(Function<Thread, S> threadFunction) {

‎paper-server/patches/features/0021-Incremental-chunk-and-player-saving.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Incremental chunk and player saving
55

66

77
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
8-
index dd9f545da1dbecbb2bb5ef5c87e4ea572eb1373f..09b8ab629db24bf9ac2abdc6162e589da18215cd 100644
8+
index a31ef450a0c8f2929065a3c10e47c14bf5eb30f2..d5f3083354d70c4da3c39e2f909ce4c7e170295c 100644
99
--- a/net/minecraft/server/MinecraftServer.java
1010
+++ b/net/minecraft/server/MinecraftServer.java
11-
@@ -953,7 +953,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
11+
@@ -970,7 +970,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
1212
boolean var4;
1313
try {
1414
this.isSaving = true;
@@ -17,7 +17,7 @@ index dd9f545da1dbecbb2bb5ef5c87e4ea572eb1373f..09b8ab629db24bf9ac2abdc6162e589d
1717
var4 = this.saveAllChunks(suppressLogs, flush, force);
1818
} finally {
1919
this.isSaving = false;
20-
@@ -1610,9 +1610,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
20+
@@ -1627,9 +1627,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2121
}
2222

2323
this.ticksUntilAutosave--;

‎paper-server/patches/features/0026-Optimise-EntityScheduler-ticking.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ index a2fbc13105673e926cbaed69221826ebd392140f..a42938e1abd371dba6806e65552fde71
2020

2121
@Override
2222
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
23-
index 09b8ab629db24bf9ac2abdc6162e589da18215cd..2bb10f5c8572bb6371424fe2be85aa543986cc1b 100644
23+
index d5f3083354d70c4da3c39e2f909ce4c7e170295c..4b1ffb5396138fc0d165ac647797b83f11d039ac 100644
2424
--- a/net/minecraft/server/MinecraftServer.java
2525
+++ b/net/minecraft/server/MinecraftServer.java
26-
@@ -1724,33 +1724,22 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
26+
@@ -1741,33 +1741,22 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2727
}
2828
}
2929

@@ -67,7 +67,7 @@ index 09b8ab629db24bf9ac2abdc6162e589da18215cd..2bb10f5c8572bb6371424fe2be85aa54
6767
io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.DIALOG_CLICK_MANAGER.handleQueue(this.tickCount); // Paper
6868
profilerFiller.push("commandFunctions");
6969
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
70-
index 450fdc0df04cbcc8f0c6ecbfc015f0d744e4a96d..063962665d9030aba70f1c820e68f836ad7111cb 100644
70+
index 16070e63d1a8e4d32aa0d812bb11f8f41e09fe3c..218395a721cbf1d39a52f1a8f2b30be1b3885250 100644
7171
--- a/net/minecraft/world/entity/Entity.java
7272
+++ b/net/minecraft/world/entity/Entity.java
7373
@@ -5224,6 +5224,11 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name

‎paper-server/patches/features/0029-Optimize-Hoppers.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ index 0000000000000000000000000000000000000000..24a2090e068ad3c0d08705050944abdf
4848
+ }
4949
+}
5050
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
51-
index 2bb10f5c8572bb6371424fe2be85aa543986cc1b..0b3b5e5f98ff324db42d9a5632d0309fafc10212 100644
51+
index 4b1ffb5396138fc0d165ac647797b83f11d039ac..dd05a184919dd4737dd0a0194b83eadb1adc4699 100644
5252
--- a/net/minecraft/server/MinecraftServer.java
5353
+++ b/net/minecraft/server/MinecraftServer.java
54-
@@ -1779,6 +1779,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
54+
@@ -1796,6 +1796,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
5555
serverLevel.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - BlockPhysicsEvent
5656
serverLevel.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent
5757
serverLevel.updateLagCompensationTick(); // Paper - lag compensation

0 commit comments

Comments
 (0)