Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-19 15:09:25 +00:00
Code Issues Releases Activity

Updated Upstream (Gale)

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

Gale Changes:
Dreeam-qwq/Gale@6f89f224 Updated Upstream (Paper)
This commit is contained in:
Dreeam-qwq
2025-02-11 01:39:20 +00:00
parent b3bd2e46a0
commit b26dc8d3f0
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group=cn.dreeam.leaf
mcVersion=1.21.4
version=1.21.4-R0.1-SNAPSHOT
galeCommit=1c139da5f2b6c16fb724366433c61aaf1edc9a62
galeCommit=6f89f2244c4c3ab4818cbbde7c4a97da4469f95f
org.gradle.configuration-cache=true
org.gradle.caching=true

10
leaf-server/paper-patches/features/0004-Purpur-Server-Paper-Changes.patch
View File

@@ -559,7 +559,7 @@ index 94ca0407303c4493ab4928b12ec6ecc75aaca549..f2d87c12dd19210ce7e2147fada5c101
+ // Purpur end - OfflinePlayer API
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 5ad91693178b5645c98804ab04a56e85a28eb426..60389075b86a7c030e59fbc4c493a4f31012a66e 100644
index c5e63626217ed730a2289a5f8e2074c9abfb7899..550336d86872e3a27ac61a994d68f249b20f08e3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -428,6 +428,20 @@ public final class CraftServer implements Server {
@@ -668,7 +668,7 @@ index 5ad91693178b5645c98804ab04a56e85a28eb426..60389075b86a7c030e59fbc4c493a4f3
@Override
public List<Recipe> getRecipesFor(ItemStack result) {
Preconditions.checkArgument(result != null, "ItemStack cannot be null");
@@ -3069,6 +3140,18 @@ public final class CraftServer implements Server {
@@ -3059,6 +3130,18 @@ public final class CraftServer implements Server {
}
// Gale end - Gale configuration - API
@@ -687,7 +687,7 @@ index 5ad91693178b5645c98804ab04a56e85a28eb426..60389075b86a7c030e59fbc4c493a4f3
@Override
public void restart() {
org.spigotmc.RestartCommand.restart();
@@ -3361,4 +3444,18 @@ public final class CraftServer implements Server {
@@ -3351,4 +3434,18 @@ public final class CraftServer implements Server {
return MinecraftServer.lastTickOversleepTime;
}
// Gale end - YAPFA - last tick time - API
@@ -762,7 +762,7 @@ index 284b58ece65d9cf6411a79abb748f1dfa52edc92..ba5797e9e518d7a1054bad0c7a1fb10b
public Collection<GeneratedStructure> getStructures(int x, int z) {
return this.getStructures(x, z, struct -> true);
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index d0becb56a9911ef4cc55ae8d7c47832f442ad52f..bdce5f9a589fedf8c7a59da9cde56056413dd723 100644
index 70d093f71cca569d9da3ae82e738f8f3069f405e..7120ff469b0a0b638a4051b92f00f97da75edae0 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -176,6 +176,13 @@ public class Main {
@@ -1362,7 +1362,7 @@ index c1b7f1281fbd41e765d2c1881763ca25b20e924d..53c620e717d39ef16f44c9697ac4809a
+ // Purpur end - Configurable chance for wolves to spawn rabid
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index d7a52220e9525502163f5ee6afbadf2baaae6190..1b7fdbecf9c28732d5196236980e87fa737a0769 100644
index fd4c1d67c134caf818f10bfd54831863c485f6a9..0131eaade61bc30a094a3166e8cd58cd7cfd7921 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -602,6 +602,15 @@ public class CraftEventFactory {

6
leaf-server/paper-patches/features/0010-Leaves-Replay-Mod-API.patch
View File

@@ -27,7 +27,7 @@ index 4c003acccdd2dd17918b15316001e52e7670123e..780f3a48152fef6a06dc67bf7fbd1965
HandlerList handlers = event.getHandlers();
RegisteredListener[] listeners = handlers.getRegisteredListeners();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 399cf37a3e823524aea48c288d270820696ba666..78904ae17d5f1b12da4825c251d8331376de78d6 100644
index 00ac7495b034163a848a8e0219a27beeed783831..be38bcad1002e80f81218518d50935e8b6361c65 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -321,6 +321,8 @@ public final class CraftServer implements Server {
@@ -48,7 +48,7 @@ index 399cf37a3e823524aea48c288d270820696ba666..78904ae17d5f1b12da4825c251d83313
@Override
public CraftPlayer apply(ServerPlayer player) {
return player.getBukkitEntity();
@@ -3458,4 +3460,11 @@ public final class CraftServer implements Server {
@@ -3448,4 +3450,11 @@ public final class CraftServer implements Server {
return getServer().lagging;
}
// Purpur end - Lagging threshold
@@ -61,7 +61,7 @@ index 399cf37a3e823524aea48c288d270820696ba666..78904ae17d5f1b12da4825c251d83313
+ // Leaves end - replay mod api
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index dca2761fe4765c6e95b5db0d0cb5c818eb8697b4..3235ec3415407d1f4fa420d398364fd62f4fd135 100644
index 0d46585c0128cea7265870de5fe260681c65d7c3..5c99cdd9e88c9a9a350393b755037b5c7433377a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -117,6 +117,8 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

4
leaf-server/paper-patches/features/0014-Including-5s-in-getTPS.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Including 5s in getTPS()
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index da73276a7f7e91911919ffca8ec231f37c18ab53..926d85d1584fa0e9ff16c4079f60cde98e6927f7 100644
index be38bcad1002e80f81218518d50935e8b6361c65..7bd8f5e5aad2e9a655c1aee81cf9c224ce7d03cc 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3182,6 +3182,8 @@ public final class CraftServer implements Server {
@@ -3172,6 +3172,8 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {