Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-04 15:41:40 +00:00
Code Issues Releases Activity

Updated Upstream (Paper/Gale)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@dd11ef8 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11102)
PaperMC/Paper@3c8a7fe Re-add missing chunk event calls (#11104)
PaperMC/Paper@a8db527 Even more cleanup of mcutil patch
PaperMC/Paper@d08e8d1 Add total time to done message (#11109)
PaperMC/Paper@2a39276 Add CrafterCraftEvent (#11082)
PaperMC/Paper@75af62b Split rewriting flag into `paper.disableOldApiSupport` and `paper.disablePluginRemapping` (#11108)
PaperMC/Paper@7ea4039 Fixup startup time log message
PaperMC/Paper@e71c1df Call PlayerChunkUnloadEvent
PaperMC/Paper@968bdeb Make CraftComplexRecipe extend CraftingRecipe (#11114)
PaperMC/Paper@f1f01a1 Adjust done message again (#11118)

Gale Changes:
Dreeam-qwq/Gale@0096a24 Update Add xor-shift random
Dreeam-qwq/Gale@4ce6439 Updated Upstream (Paper)
Dreeam-qwq/Gale@d4f0ad7 Updated Upstream (Paper)
This commit is contained in:
Dreeam
2024-07-20 08:05:38 +08:00
parent 8aa8b7d26c
commit 41c0ee47fc
19 changed files with 137 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
patches/server/0014-Remove-Timings.patch
View File

@@ -905,7 +905,7 @@ index e2c24813f59c2fd075c740ac1842a38f20ed8554..1f7f68aad97ee73763c042837f239bdc
} catch (Exception exception) {
if (exception instanceof ReportedException) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 08c8aae84042619a65c33db9d000e4088319b54e..aa40039353b9b825370fb01d1da31c157590b046 100644
index 5e591de2fae3b18aa7bd859ccc95f0c9fdee3c4d..c4c8111bd85e6a8acbffea093d209710cb63b2f8 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -187,8 +187,6 @@ import org.bukkit.craftbukkit.CraftRegistry;
@@ -1043,7 +1043,7 @@ index 08c8aae84042619a65c33db9d000e4088319b54e..aa40039353b9b825370fb01d1da31c15
iterator = this.playerList.getPlayers().iterator();
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index e9d6f0cdb5b1f15e1536844b6a8637f3e7d21c6f..020a0f033f64875bb04d1dead332d471d480935f 100644
index 5d5659a4514402edfd474e176534d363c56e0496..eef6f0533310a4d1f6e34250e0030e41bec2325a 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -69,7 +69,6 @@ import org.apache.logging.log4j.Level;
@@ -1096,7 +1096,7 @@ index e9d6f0cdb5b1f15e1536844b6a8637f3e7d21c6f..020a0f033f64875bb04d1dead332d471
// Paper start
if (waitableArray[0] != null) {
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 41648e29c8f90d1a0a0ebc54be03890383ff15f1..d31a2c3f1ff62f60a058148760fb6dbf92e46a76 100644
index 84d5891ed67e9123f9b8f029fb14f944e34c3332..10479df72c815e235f5eef9eeae3bdd32f1ef665 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -1,6 +1,5 @@
@@ -1392,7 +1392,7 @@ index ac323393d7fe0b77bafb0728b7eb545930136e6e..b97f3ec10552941892b2b6edd53a873e
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index e3cc24c2c7eb9cc8928fe300137eb9baac70e91f..d34e31c6f7591bfdd34a6f2fe9376a515f20c3b7 100644
index 43a727475a787cd1ddc6345f366f1b2f477fcfde..adb9956f3350f1e58cbe5d26602412c0043e0d62 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1,6 +1,5 @@
@@ -1402,7 +1402,7 @@ index e3cc24c2c7eb9cc8928fe300137eb9baac70e91f..d34e31c6f7591bfdd34a6f2fe9376a51
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -1289,7 +1288,6 @@ public abstract class PlayerList {
@@ -1290,7 +1289,6 @@ public abstract class PlayerList {
public void saveAll(int interval) {
io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
@@ -1410,7 +1410,7 @@ index e3cc24c2c7eb9cc8928fe300137eb9baac70e91f..d34e31c6f7591bfdd34a6f2fe9376a51
int numSaved = 0;
long now = MinecraftServer.currentTick;
for (int i = 0; i < this.players.size(); ++i) {
@@ -1300,7 +1298,6 @@ public abstract class PlayerList {
@@ -1301,7 +1299,6 @@ public abstract class PlayerList {
}
// Paper end - Incremental chunk and player saving
}
@@ -1706,7 +1706,7 @@ index 36540053590c30a902b9986dcf2e74375157822d..fb0ffd302ec87516cd7f28b8b4c6a8e9
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 4878f26e9daf98858e45e14abb37b27b6f3f9c0a..6cd292c92486a807ab651f784171793d763e43d4 100644
index 3786ee6f97fb857649b31139152a77c2ec26494f..5d10f4f9e36c0ef448110788ff54df70256c065c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -477,7 +477,6 @@ public final class CraftServer implements Server {
@@ -1717,7 +1717,7 @@ index 4878f26e9daf98858e45e14abb37b27b6f3f9c0a..6cd292c92486a807ab651f784171793d
this.overrideSpawnLimits();
console.autosavePeriod = this.configuration.getInt("ticks-per.autosave");
this.warningState = WarningState.value(this.configuration.getString("settings.deprecated-verbose"));
@@ -1024,10 +1023,8 @@ public final class CraftServer implements Server {
@@ -1033,10 +1032,8 @@ public final class CraftServer implements Server {
commands.performCommand(results, commandLine, commandLine, true);
} catch (CommandException ex) {
this.pluginManager.callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerCommandException(ex, target, sender, args))); // Paper
@@ -1729,7 +1729,7 @@ index 4878f26e9daf98858e45e14abb37b27b6f3f9c0a..6cd292c92486a807ab651f784171793d
this.pluginManager.callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerCommandException(ex, target, sender, args))); // Paper
throw new CommandException(msg, ex);
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index 006adb2adb27c497ede69f87e78bc3e34499cbf8..4ee1c3461d21feab3a54e76a7c2ab80b6ea2ab38 100644
index fba0558f46516f65c678635359f305f865336d3a..e1ff5511d4694c13249443da0f127456d53e5543 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -1,6 +1,5 @@
@@ -1739,7 +1739,7 @@ index 006adb2adb27c497ede69f87e78bc3e34499cbf8..4ee1c3461d21feab3a54e76a7c2ab80b
import com.google.common.base.Preconditions;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import java.util.ArrayList;
@@ -304,7 +303,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -297,7 +296,7 @@ public class CraftScheduler implements BukkitScheduler {
}
return false;
}
@@ -1748,7 +1748,7 @@ index 006adb2adb27c497ede69f87e78bc3e34499cbf8..4ee1c3461d21feab3a54e76a7c2ab80b
this.handle(task, 0L);
for (CraftTask taskPending = this.head.getNext(); taskPending != null; taskPending = taskPending.getNext()) {
if (taskPending == task) {
@@ -344,7 +343,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -337,7 +336,7 @@ public class CraftScheduler implements BukkitScheduler {
}
}
}
@@ -1757,7 +1757,7 @@ index 006adb2adb27c497ede69f87e78bc3e34499cbf8..4ee1c3461d21feab3a54e76a7c2ab80b
this.handle(task, 0L);
for (CraftTask taskPending = this.head.getNext(); taskPending != null; taskPending = taskPending.getNext()) {
if (taskPending == task) {
@@ -515,10 +514,8 @@ public class CraftScheduler implements BukkitScheduler {
@@ -504,10 +503,8 @@ public class CraftScheduler implements BukkitScheduler {
this.runners.remove(task.getTaskId());
}
}
@@ -1768,7 +1768,7 @@ index 006adb2adb27c497ede69f87e78bc3e34499cbf8..4ee1c3461d21feab3a54e76a7c2ab80b
//this.debugHead = this.debugHead.getNextHead(currentTick); // Paper
}
@@ -561,7 +558,6 @@ public class CraftScheduler implements BukkitScheduler {
@@ -550,7 +547,6 @@ public class CraftScheduler implements BukkitScheduler {
}
void parsePending() { // Paper
@@ -1776,7 +1776,7 @@ index 006adb2adb27c497ede69f87e78bc3e34499cbf8..4ee1c3461d21feab3a54e76a7c2ab80b
CraftTask head = this.head;
CraftTask task = head.getNext();
CraftTask lastTask = head;
@@ -580,7 +576,6 @@ public class CraftScheduler implements BukkitScheduler {
@@ -569,7 +565,6 @@ public class CraftScheduler implements BukkitScheduler {
task.setNext(null);
}
this.head = lastTask;
@@ -1785,7 +1785,7 @@ index 006adb2adb27c497ede69f87e78bc3e34499cbf8..4ee1c3461d21feab3a54e76a7c2ab80b
private boolean isReady(final int currentTick) {
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
index ea26d9464644b5217879b8c21b4da28e57708dcb..cee5c35ac2ba48d092f4227119c915e641a498c6 100644
index ba369f3dcfdf498e971dc4405d39657a9b6e97cc..bb6b5c0f331096fe2d1d08b2b8268662fd675e07 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
@@ -2,15 +2,10 @@ package org.bukkit.craftbukkit.scheduler;
@@ -1812,20 +1812,7 @@ index ea26d9464644b5217879b8c21b4da28e57708dcb..cee5c35ac2ba48d092f4227119c915e6
private final Plugin plugin;
private final int id;
private final long createdAt = System.nanoTime();
@@ -50,12 +44,10 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
this.rTask = (Runnable) task;
this.cTask = null;
this.plugin = CraftScheduler.MINECRAFT;
- this.taskName = taskName;
this.internal = true;
this.id = id;
this.period = CraftTask.NO_REPEATING;
this.taskName = taskName;
- this.timings = MinecraftTimings.getInternalTaskName(taskName);
}
// Paper end
@@ -76,7 +68,6 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
@@ -61,7 +55,6 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
}
this.id = id;
this.period = period;
@@ -1833,7 +1820,7 @@ index ea26d9464644b5217879b8c21b4da28e57708dcb..cee5c35ac2ba48d092f4227119c915e6
}
@Override
@@ -96,13 +87,11 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
@@ -81,13 +74,11 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
@Override
public void run() {
@@ -1869,10 +1856,10 @@ index b3e1adeb932da9b3bed16acd94e2f16da48a7c72..e9798517b9211c50a20ea5c69603aab3
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 150769691fd0c6abad77a4823b5f7dd667a032d1..b008e7ad153753228206ca969f86cb528676e278 100644
index 51e30d84080c8d32138217e0e8eda181f7f737db..024dc051986ebb9d83f4bf9b020b586f6219f6b0 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -215,9 +215,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -199,9 +199,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
// ========================================================================
// Paper start
@Override
@@ -1883,7 +1870,7 @@ index 150769691fd0c6abad77a4823b5f7dd667a032d1..b008e7ad153753228206ca969f86cb52
// Paper end
public static byte toLegacyData(BlockState data) {
@@ -493,7 +491,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -482,7 +480,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
// Paper start
@Override
public String getTimingsServerName() {