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
This commit is contained in:
Dreeam
2023-04-30 06:28:59 -04:00
parent 316a86b8b8
commit 27d333f6f7
28 changed files with 94 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@@ -4,7 +4,7 @@ plugins {
java java
`maven-publish` `maven-publish`
id("com.github.johnrengelman.shadow") version "8.1.1" apply false id("com.github.johnrengelman.shadow") version "8.1.1" apply false
id("io.papermc.paperweight.patcher") version "1.5.5-SNAPSHOT" id("io.papermc.paperweight.patcher") version "1.5.5"
} }
val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group = org.dreeam.leaf group = org.dreeam.leaf
version = 1.19.4-R0.1-SNAPSHOT version = 1.19.4-R0.1-SNAPSHOT
galeCommit = f8e876fbef1d292a0f6a491afdd2f0635f1e77b3 galeCommit = 798ae738ad772e581f33ff02cbb3a9d167f68fd4
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000 networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

4
patches/api/0001-Leaf-config-files.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Leaf config files
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index db76574dd624e7edabc0fde717e7788dd66b7845..2f9fdb47acdcaddf1ab229d2219c6e5f715948c6 100644 index 6253e761c595c8b89d08f9d42fe3e19cadbf4918..66740fa8e37204c3f7f9275b45f398d80f2ff44e 100644
--- a/src/main/java/org/bukkit/Server.java --- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java
@@ -2024,6 +2024,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @@ -2021,6 +2021,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
// Paper end // Paper end

7
patches/api/0002-Bump-Dependencies.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index 8af9efe2dbc9563a2c327002cf05c5d2fd8fc68b..48ed37437a15a7b9acaa597eef1044beb355fbe8 100644 index 0719e49dde343c80d18daf82d7fed926150d7d6d..f8610e8337a2d2800ccce4c5462e7e997a22f32c 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -24,15 +24,17 @@ configurations.api { @@ -24,15 +24,17 @@ configurations.api {
@@ -82,9 +82,8 @@ index 8af9efe2dbc9563a2c327002cf05c5d2fd8fc68b..48ed37437a15a7b9acaa597eef1044be
options.use() options.use()
options.isDocFilesSubDirs = true options.isDocFilesSubDirs = true
options.links( options.links(
- "https://guava.dev/releases/31.0.1-jre/api/docs/",
+ // Leaf - Bump Dependencies + // Leaf - Bump Dependencies
+ "https://guava.dev/releases/31.1-jre/api/docs/", "https://guava.dev/releases/31.1-jre/api/docs/",
"https://javadoc.io/doc/org.yaml/snakeyaml/1.33/", "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/",
- "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations - "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations
+ "https://javadoc.io/doc/org.jetbrains/annotations/24.0.1/", // Paper - we don't want Java 5 annotations + "https://javadoc.io/doc/org.jetbrains/annotations/24.0.1/", // Paper - we don't want Java 5 annotations
@@ -92,7 +91,7 @@ index 8af9efe2dbc9563a2c327002cf05c5d2fd8fc68b..48ed37437a15a7b9acaa597eef1044be
// Paper start // Paper start
//"https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", // don't link to bungee chat //"https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", // don't link to bungee chat
"https://jd.advntr.dev/api/$adventureVersion/", "https://jd.advntr.dev/api/$adventureVersion/",
@@ -154,6 +160,9 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks. @@ -155,6 +161,9 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.
jarToScan.set(tasks.jar.flatMap { it.archiveFile }) jarToScan.set(tasks.jar.flatMap { it.archiveFile })
classpath.from(configurations.compileClasspath) classpath.from(configurations.compileClasspath)
} }

8
patches/api/0003-Purpur-Lagging-threshold.patch
View File

@@ -7,10 +7,10 @@ Original license: MIT
Original project: https://github.com/PurpurMC/Purpur Original project: https://github.com/PurpurMC/Purpur
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index daf11e58b0a5f8cc8890af24fa51e3c46a4043b6..f9d2621e2e9972c6762bb3c5736398a0b9186d4a 100644 index bf33dfa921e0099490e5485ac85a0c84645929e7..845ecdc47fd04ba919ca7891ded31571b1666cf3 100644
--- a/src/main/java/org/bukkit/Bukkit.java --- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2517,4 +2517,15 @@ public final class Bukkit { @@ -2514,4 +2514,15 @@ public final class Bukkit {
public static Server.Spigot spigot() { public static Server.Spigot spigot() {
return server.spigot(); return server.spigot();
} }
@@ -27,10 +27,10 @@ index daf11e58b0a5f8cc8890af24fa51e3c46a4043b6..f9d2621e2e9972c6762bb3c5736398a0
+ // Purpur end + // Purpur end
} }
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 2f9fdb47acdcaddf1ab229d2219c6e5f715948c6..b8f99cd62439c3e3af62f36e77c4427680c0923c 100644 index 66740fa8e37204c3f7f9275b45f398d80f2ff44e..abcdfea6203d28aa22c8fb802778d2d80aec461d 100644
--- a/src/main/java/org/bukkit/Server.java --- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java
@@ -2226,4 +2226,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @@ -2223,4 +2223,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
long getLastTickOversleepTime(); long getLastTickOversleepTime();
// Gale end - YAPFA - last tick time - API // Gale end - YAPFA - last tick time - API

4
patches/api/0004-Purpur-ChatColor-conveniences.patch
View File

@@ -7,7 +7,7 @@ Original license: MIT
Original project: https://github.com/PurpurMC/Purpur Original project: https://github.com/PurpurMC/Purpur
diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java
index e3f185dc982d1c38195a4e01ddd485c13ffa58c0..98c2f73ee5c921dab506fc933a0acff400201537 100644 index ea4ceb643239c26851bacbf45fc3f2efef3bb4be..3b8395dcb73e3fb251adf7438cbc7e95c4185a3a 100644
--- a/src/main/java/org/bukkit/ChatColor.java --- a/src/main/java/org/bukkit/ChatColor.java
+++ b/src/main/java/org/bukkit/ChatColor.java +++ b/src/main/java/org/bukkit/ChatColor.java
@@ -3,6 +3,7 @@ package org.bukkit; @@ -3,6 +3,7 @@ package org.bukkit;
@@ -18,7 +18,7 @@ index e3f185dc982d1c38195a4e01ddd485c13ffa58c0..98c2f73ee5c921dab506fc933a0acff4
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -454,4 +455,77 @@ public enum ChatColor { @@ -455,4 +456,77 @@ public enum ChatColor {
BY_CHAR.put(color.code, color); BY_CHAR.put(color.code, color);
} }
} }

4
patches/api/0006-KTP-Optimize-Spigot-event-bus.patch
View File

@@ -87,10 +87,10 @@ index 3b3d9642a8d63798dc28f2f8df77f0466451cbff..8d3605f25e97a375971705c737bc7bac
} }
} }
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
index 1758e8a89c85eea8c2161ddcb5b0e745151a1f5e..050c839f06060b16ed7c284bffa3104ac4cd7276 100644 index 13da387d3b59bc67c0d73e3fbd3a4034b1281527..238384d4ecd3e39ca31bf232384dd4369e40ae20 100644
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -305,4 +305,12 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm @@ -304,4 +304,12 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
} }
// Paper end // Paper end

4
patches/api/0007-KeYi-Player-Skull-API.patch
View File

@@ -7,7 +7,7 @@ Original license: MIT
Original project: https://github.com/KeYiMC/KeYi Original project: https://github.com/KeYiMC/KeYi
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 15c57f3e4e1c023e0f3168ce03dd770f006cf27b..54e33829b1ece5ba990b38f9fb86d39fbba9d714 100644 index 2258276b31dda927003367a92e31f05f2c362b1e..840271a830e695e42d97212c174e32d19474e378 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -4,7 +4,10 @@ import java.net.InetSocketAddress; @@ -4,7 +4,10 @@ import java.net.InetSocketAddress;
@@ -22,7 +22,7 @@ index 15c57f3e4e1c023e0f3168ce03dd770f006cf27b..54e33829b1ece5ba990b38f9fb86d39f
import org.bukkit.DyeColor; import org.bukkit.DyeColor;
import org.bukkit.Effect; import org.bukkit.Effect;
import org.bukkit.GameMode; import org.bukkit.GameMode;
@@ -3012,4 +3015,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -3047,4 +3050,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override @Override
Spigot spigot(); Spigot spigot();
// Spigot end // Spigot end

4
patches/api/0008-Slice-Smooth-Teleports.patch
View File

@@ -7,10 +7,10 @@ Original license: MIT
Original project: https://github.com/Cryptite/Slice Original project: https://github.com/Cryptite/Slice
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 54e33829b1ece5ba990b38f9fb86d39fbba9d714..3d9fe3723e020ba503d132065c4d164d9ba9c700 100644 index 840271a830e695e42d97212c174e32d19474e378..7e43c769833b310b9e34afb48215c9b717a5a7fd 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2897,6 +2897,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -2932,6 +2932,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
String getClientBrandName(); String getClientBrandName();
// Paper end // Paper end

8
patches/server/0002-Leaf-Config.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Leaf Config
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index 0785aef21cc7c89d971d22188d287c6406e44ac6..c088aca3cd93a09860089bbc39e39ba65a8eec0a 100644 index a681913af54f11633d7b3fc2a833ae64028dd25d..493acdeeb56ed13a0c30d9d10b2f9171df296d98 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -49,6 +49,13 @@ dependencies { @@ -49,6 +49,13 @@ dependencies {
@@ -23,10 +23,10 @@ index 0785aef21cc7c89d971d22188d287c6406e44ac6..c088aca3cd93a09860089bbc39e39ba6
testImplementation("junit:junit:4.13.2") testImplementation("junit:junit:4.13.2")
testImplementation("org.hamcrest:hamcrest-library:1.3") testImplementation("org.hamcrest:hamcrest-library:1.3")
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
index 781fc0a92f73be73b9313e7bc4eeb2f2ed6ff8ea..b40c03e42e02bca29fe8b107d9382db6e49c1d1e 100644 index e7d93cb9b219542736ef870bbbefacc359c0b46f..ae94e908d97aa88bdac7380a48db7816e10837be 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java --- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java +++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -307,8 +307,9 @@ public class TimingsExport extends Thread { @@ -308,8 +308,9 @@ public class TimingsExport extends Thread {
pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)), pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
// Gale start - Gale configuration - include in timings // Gale start - Gale configuration - include in timings
pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
@@ -38,7 +38,7 @@ index 781fc0a92f73be73b9313e7bc4eeb2f2ed6ff8ea..b40c03e42e02bca29fe8b107d9382db6
new TimingsExport(listeners, parent, history).start(); new TimingsExport(listeners, parent, history).start();
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 6df45f1978ad075c37902940e7a925dea0717606..3b73a250d738d75ce2bc2078b380938bc64186ee 100644 index 4e82ff6b3167bda96f743c79d63c10145408ad4e..c604a8a33fa98c40ce54eb9e2fda0862d5185e24 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1880,7 +1880,7 @@ public abstract class MinecraftServer extends MinecraftServerBlockableEventLoop @@ -1880,7 +1880,7 @@ public abstract class MinecraftServer extends MinecraftServerBlockableEventLoop

4
patches/server/0007-Remove-UseItemOnPacket-Too-Far-Check.patch
View File

@@ -7,7 +7,7 @@ This Check is added in 1.17.x -> 1.18.x update by Mojang.
By removing this check, it enable hackers to use some modules of hack clients. By removing this check, it enable hackers to use some modules of hack clients.
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index cfa431c16d3e366b9bba3539a95286c7485993e1..37890682543302feef9717c3889bfab655b2ec27 100644 index 520db3face9bd9d05e583c319dda7d6630afbeaa..f736726a2654ba4242aa96b9516c15bfa883fdb6 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -190,6 +190,7 @@ import org.bukkit.craftbukkit.util.permissions.CraftDefaultPermissions; @@ -190,6 +190,7 @@ import org.bukkit.craftbukkit.util.permissions.CraftDefaultPermissions;
@@ -18,7 +18,7 @@ index cfa431c16d3e366b9bba3539a95286c7485993e1..37890682543302feef9717c3889bfab6
import org.slf4j.Logger; import org.slf4j.Logger;
// CraftBukkit start // CraftBukkit start
@@ -1969,7 +1970,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -1978,7 +1979,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
Vec3 vec3d2 = vec3d.subtract(vec3d1); Vec3 vec3d2 = vec3d.subtract(vec3d1);
double d0 = 1.0000001D; double d0 = 1.0000001D;

18
patches/server/0009-Purpur-Implement-TPSBar.patch
View File

@@ -66,7 +66,7 @@ index 1a28f9b348a24448bd4a327e1bf0dfab4dc301f5..265c2f9b6b5301f52ef8cf544bbeb8f4
if (environment.includeIntegrated) { if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 3b73a250d738d75ce2bc2078b380938bc64186ee..ef9511d74a185c800e106c1192bbb8162f037326 100644 index c604a8a33fa98c40ce54eb9e2fda0862d5185e24..14c943a4228628e2d064cd26fe13a3e2c4cc2fb8 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1130,6 +1130,7 @@ public abstract class MinecraftServer extends MinecraftServerBlockableEventLoop @@ -1130,6 +1130,7 @@ public abstract class MinecraftServer extends MinecraftServerBlockableEventLoop
@@ -98,10 +98,10 @@ index b104a38d2c879b649a3862876c389564c69e83b4..001738c2553cb73a9ed647302a99b462
} }
} }
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index aee10fe735b4ccbafbd92908890989b6b8b3685d..74556d5a894a83ca2053c6dbd8117b53b80c28ed 100644 index 3611844b0e925af88975d56ecf94b21b3bbbcb9f..9da1928b955490041c4eddc8c131286e557d2784 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -275,6 +275,7 @@ public class ServerPlayer extends Player { @@ -276,6 +276,7 @@ public class ServerPlayer extends Player {
public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
@@ -109,7 +109,7 @@ index aee10fe735b4ccbafbd92908890989b6b8b3685d..74556d5a894a83ca2053c6dbd8117b53
public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) { public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile); super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
@@ -513,6 +514,7 @@ public class ServerPlayer extends Player { @@ -514,6 +515,7 @@ public class ServerPlayer extends Player {
} }
} }
@@ -117,7 +117,7 @@ index aee10fe735b4ccbafbd92908890989b6b8b3685d..74556d5a894a83ca2053c6dbd8117b53
} }
@Override @Override
@@ -579,6 +581,7 @@ public class ServerPlayer extends Player { @@ -580,6 +582,7 @@ public class ServerPlayer extends Player {
} }
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
@@ -125,7 +125,7 @@ index aee10fe735b4ccbafbd92908890989b6b8b3685d..74556d5a894a83ca2053c6dbd8117b53
} }
// CraftBukkit start - World fallback code, either respawn location or global spawn // CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2543,4 +2546,14 @@ public class ServerPlayer extends Player { @@ -2554,4 +2557,14 @@ public class ServerPlayer extends Player {
return (CraftPlayer) super.getBukkitEntity(); return (CraftPlayer) super.getBukkitEntity();
} }
// CraftBukkit end // CraftBukkit end
@@ -141,7 +141,7 @@ index aee10fe735b4ccbafbd92908890989b6b8b3685d..74556d5a894a83ca2053c6dbd8117b53
+ // Purpur end + // Purpur end
} }
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 996f4debc4e5fd2aa6097a0d9769481b9bad70b9..cb5ff86443cd1c599f3167b050cf15ec348eacca 100644 index b798495da37b9502f1ae93a9a1711411a5dfebf5..5aa632e66f09b591aa4c4349777576dbacf670fe 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java --- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -106,6 +106,7 @@ import net.minecraft.world.scores.Scoreboard; // Paper @@ -106,6 +106,7 @@ import net.minecraft.world.scores.Scoreboard; // Paper
@@ -152,7 +152,7 @@ index 996f4debc4e5fd2aa6097a0d9769481b9bad70b9..cb5ff86443cd1c599f3167b050cf15ec
import org.slf4j.Logger; import org.slf4j.Logger;
// CraftBukkit start // CraftBukkit start
@@ -528,6 +529,7 @@ public abstract class PlayerList { @@ -533,6 +534,7 @@ public abstract class PlayerList {
scoreboard.addPlayerToTeam(player.getScoreboardName(), collideRuleTeam); scoreboard.addPlayerToTeam(player.getScoreboardName(), collideRuleTeam);
} }
// Paper end // Paper end
@@ -160,7 +160,7 @@ index 996f4debc4e5fd2aa6097a0d9769481b9bad70b9..cb5ff86443cd1c599f3167b050cf15ec
// CraftBukkit - Moved from above, added world // CraftBukkit - Moved from above, added world
if (GaleGlobalConfiguration.get().logToConsole.playerLoginLocations) { // Gale - JettPack - make logging login location configurable if (GaleGlobalConfiguration.get().logToConsole.playerLoginLocations) { // Gale - JettPack - make logging login location configurable
PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", player.getName().getString(), s1, player.getId(), worldserver1.serverLevelData.getLevelName(), player.getX(), player.getY(), player.getZ()); PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", player.getName().getString(), s1, player.getId(), worldserver1.serverLevelData.getLevelName(), player.getX(), player.getY(), player.getZ());
@@ -643,6 +645,8 @@ public abstract class PlayerList { @@ -648,6 +650,8 @@ public abstract class PlayerList {
} }
public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) { public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) {
// Paper end // Paper end

10
patches/server/0010-Purpur-Add-compass-command.patch
View File

@@ -19,10 +19,10 @@ index 265c2f9b6b5301f52ef8cf544bbeb8f4a9242737..5ddaaf3b50b6483143e21f278d3fd732
if (environment.includeIntegrated) { if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 74556d5a894a83ca2053c6dbd8117b53b80c28ed..f0cf0f82920e09a984c8c3dbb131103beb327163 100644 index 9da1928b955490041c4eddc8c131286e557d2784..2214f3542f9ee8b6fd971eeb02ed7d0e87b6a1d8 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -276,6 +276,7 @@ public class ServerPlayer extends Player { @@ -277,6 +277,7 @@ public class ServerPlayer extends Player {
public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
private boolean tpsBar = false; // Purpur private boolean tpsBar = false; // Purpur
@@ -30,7 +30,7 @@ index 74556d5a894a83ca2053c6dbd8117b53b80c28ed..f0cf0f82920e09a984c8c3dbb131103b
public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) { public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile); super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
@@ -515,6 +516,7 @@ public class ServerPlayer extends Player { @@ -516,6 +517,7 @@ public class ServerPlayer extends Player {
} }
if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur
@@ -38,7 +38,7 @@ index 74556d5a894a83ca2053c6dbd8117b53b80c28ed..f0cf0f82920e09a984c8c3dbb131103b
} }
@Override @Override
@@ -582,6 +584,7 @@ public class ServerPlayer extends Player { @@ -583,6 +585,7 @@ public class ServerPlayer extends Player {
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
@@ -46,7 +46,7 @@ index 74556d5a894a83ca2053c6dbd8117b53b80c28ed..f0cf0f82920e09a984c8c3dbb131103b
} }
// CraftBukkit start - World fallback code, either respawn location or global spawn // CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2555,5 +2558,13 @@ public class ServerPlayer extends Player { @@ -2566,5 +2569,13 @@ public class ServerPlayer extends Player {
public void tpsBar(boolean tpsBar) { public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar; this.tpsBar = tpsBar;
} }

10
patches/server/0011-Purpur-Implement-ram-and-rambar-commands.patch
View File

@@ -20,10 +20,10 @@ index 5ddaaf3b50b6483143e21f278d3fd732429e64d4..e94bcacae678b70a61c428dd307b860a
if (environment.includeIntegrated) { if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index f0cf0f82920e09a984c8c3dbb131103beb327163..807bae553cf0008e3ca328b85fb210dc6a929fde 100644 index 2214f3542f9ee8b6fd971eeb02ed7d0e87b6a1d8..28dc9687c43d03a88fab2f525ea48e8c375bcc9a 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -277,6 +277,7 @@ public class ServerPlayer extends Player { @@ -278,6 +278,7 @@ public class ServerPlayer extends Player {
public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
private boolean tpsBar = false; // Purpur private boolean tpsBar = false; // Purpur
private boolean compassBar = false; // Purpur private boolean compassBar = false; // Purpur
@@ -31,7 +31,7 @@ index f0cf0f82920e09a984c8c3dbb131103beb327163..807bae553cf0008e3ca328b85fb210dc
public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) { public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile); super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
@@ -515,6 +516,7 @@ public class ServerPlayer extends Player { @@ -516,6 +517,7 @@ public class ServerPlayer extends Player {
} }
} }
@@ -39,7 +39,7 @@ index f0cf0f82920e09a984c8c3dbb131103beb327163..807bae553cf0008e3ca328b85fb210dc
if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur
if (nbt.contains("Purpur.CompassBar")) { this.compassBar = nbt.getBoolean("Purpur.CompassBar"); } // Purpur if (nbt.contains("Purpur.CompassBar")) { this.compassBar = nbt.getBoolean("Purpur.CompassBar"); } // Purpur
} }
@@ -583,6 +585,7 @@ public class ServerPlayer extends Player { @@ -584,6 +586,7 @@ public class ServerPlayer extends Player {
} }
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
@@ -47,7 +47,7 @@ index f0cf0f82920e09a984c8c3dbb131103beb327163..807bae553cf0008e3ca328b85fb210dc
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
} }
@@ -2566,5 +2569,14 @@ public class ServerPlayer extends Player { @@ -2577,5 +2580,14 @@ public class ServerPlayer extends Player {
public void compassBar(boolean compassBar) { public void compassBar(boolean compassBar) {
this.compassBar = compassBar; this.compassBar = compassBar;
} }

6
patches/server/0012-Purpur-Lagging-threshold.patch
View File

@@ -7,7 +7,7 @@ Original license: MIT
Original project: https://github.com/PurpurMC/Purpur Original project: https://github.com/PurpurMC/Purpur
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 62d5f67f9bfbffe7d8d8170ecef0aa977b048228..0ce5c9e0fa87b8ba574e0b4b4ac4f4b231609b3b 100644 index 14c943a4228628e2d064cd26fe13a3e2c4cc2fb8..5545c1cc52e6fd94af49bf285f1046f381c4ff1e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -408,6 +408,7 @@ public abstract class MinecraftServer extends MinecraftServerBlockableEventLoop @@ -408,6 +408,7 @@ public abstract class MinecraftServer extends MinecraftServerBlockableEventLoop
@@ -27,10 +27,10 @@ index 62d5f67f9bfbffe7d8d8170ecef0aa977b048228..0ce5c9e0fa87b8ba574e0b4b4ac4f4b2
} }
// Spigot end // Spigot end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 76e96b8a57bb84b92abc7932b8fed2950aaa87bb..2935b3d08fc186abd191f2f2c6f5157cfc45da6b 100644 index 586bb5f9b98594d29731e52760c74b7390d330d5..294083bdf24edee846a33cc6957b780f221e9466 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2994,4 +2994,10 @@ public final class CraftServer implements Server { @@ -2990,4 +2990,10 @@ public final class CraftServer implements Server {
} }
// Gale end - YAPFA - last tick time - API // Gale end - YAPFA - last tick time - API

14
patches/server/0016-Purpur-Configurable-broadcast-settings.patch
View File

@@ -19,10 +19,10 @@ index c953f7f2f125985eeec9563a22f9188cc979cd36..09ba481ca721306d3696078e475850a9
// Paper end // Paper end
} }
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 807bae553cf0008e3ca328b85fb210dc6a929fde..b9b16f566103798c95592b2921b48a2585a65e73 100644 index 28dc9687c43d03a88fab2f525ea48e8c375bcc9a..24ed77ffa334269c56cf2796ff9da9045826ae5c 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -954,6 +954,7 @@ public class ServerPlayer extends Player { @@ -955,6 +955,7 @@ public class ServerPlayer extends Player {
})); }));
Team scoreboardteambase = this.getTeam(); Team scoreboardteambase = this.getTeam();
@@ -30,7 +30,7 @@ index 807bae553cf0008e3ca328b85fb210dc6a929fde..b9b16f566103798c95592b2921b48a25
if (scoreboardteambase != null && scoreboardteambase.getDeathMessageVisibility() != Team.Visibility.ALWAYS) { if (scoreboardteambase != null && scoreboardteambase.getDeathMessageVisibility() != Team.Visibility.ALWAYS) {
if (scoreboardteambase.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) { if (scoreboardteambase.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) {
this.server.getPlayerList().broadcastSystemToTeam(this, ichatbasecomponent); this.server.getPlayerList().broadcastSystemToTeam(this, ichatbasecomponent);
@@ -1721,6 +1722,26 @@ public class ServerPlayer extends Player { @@ -1732,6 +1733,26 @@ public class ServerPlayer extends Player {
this.lastSentExp = -1; // CraftBukkit - Added to reset this.lastSentExp = -1; // CraftBukkit - Added to reset
} }
@@ -58,10 +58,10 @@ index 807bae553cf0008e3ca328b85fb210dc6a929fde..b9b16f566103798c95592b2921b48a25
public void displayClientMessage(Component message, boolean overlay) { public void displayClientMessage(Component message, boolean overlay) {
this.sendSystemMessage(message, overlay); this.sendSystemMessage(message, overlay);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index cb5ff86443cd1c599f3167b050cf15ec348eacca..bbd2e5cba28b6eded49c6bb70db24f2e0d7a5e84 100644 index 5aa632e66f09b591aa4c4349777576dbacf670fe..a722d4d1f4320b02ad2cbc22c45020b9797f7e6c 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java --- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1140,6 +1140,20 @@ public abstract class PlayerList { @@ -1145,6 +1145,20 @@ public abstract class PlayerList {
} }
// CraftBukkit end // CraftBukkit end
@@ -103,10 +103,10 @@ index 93a1e990b0a6caae4143c2f9d09bfb368fa1d6db..615611fe372d6edaef56db058bbf2cf7
return this.type().msgId(); return this.type().msgId();
} }
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 697fad59a6ab4fb41aac65979b42d8ed4b4c8c21..1544c29011ec8d2074dc2e1e107a6e32f351d7c4 100644 index 5f5d5aad855c64719420b0c67f543a118ee761e4..ca81a4d7119d8b228d6db2f05e2d7f682af67cc3 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3922,6 +3922,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -3928,6 +3928,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return SlotAccess.NULL; return SlotAccess.NULL;
} }

6
patches/server/0018-Purpur-Add-more-logger-output-for-invalid-movement-k.patch
View File

@@ -7,10 +7,10 @@ Original license: MIT
Original project: https://github.com/PurpurMC/Purpur Original project: https://github.com/PurpurMC/Purpur
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 37890682543302feef9717c3889bfab655b2ec27..89416f1222bb31275ae033009dac18b5578d5807 100644 index f736726a2654ba4242aa96b9516c15bfa883fdb6..f2070090ea0966e37523fc714d5bca310406b651 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -839,6 +839,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -848,6 +848,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
if (packet.getId() == this.awaitingTeleport) { if (packet.getId() == this.awaitingTeleport) {
if (this.awaitingPositionFromClient == null) { if (this.awaitingPositionFromClient == null) {
this.disconnect(Component.translatable("multiplayer.disconnect.invalid_player_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PLAYER_MOVEMENT); // Paper - kick event cause this.disconnect(Component.translatable("multiplayer.disconnect.invalid_player_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PLAYER_MOVEMENT); // Paper - kick event cause
@@ -18,7 +18,7 @@ index 37890682543302feef9717c3889bfab655b2ec27..89416f1222bb31275ae033009dac18b5
return; return;
} }
@@ -1403,8 +1404,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -1412,8 +1413,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@Override @Override
public void handleMovePlayer(ServerboundMovePlayerPacket packet) { public void handleMovePlayer(ServerboundMovePlayerPacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());

4
patches/server/0021-Purpur-Option-to-disable-kick-for-out-of-order-chat.patch
View File

@@ -7,10 +7,10 @@ Original license: MIT
Original project: https://github.com/PurpurMC/Purpur Original project: https://github.com/PurpurMC/Purpur
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 89416f1222bb31275ae033009dac18b5578d5807..441d5ed7f48a3725a0a50441eaa8ab68ce1025d8 100644 index f2070090ea0966e37523fc714d5bca310406b651..ba675f2da807b049aa176400326436a50809b373 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2399,7 +2399,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -2409,7 +2409,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
do { do {
instant1 = (Instant) this.lastChatTimeStamp.get(); instant1 = (Instant) this.lastChatTimeStamp.get();
if (timestamp.isBefore(instant1)) { if (timestamp.isBefore(instant1)) {

8
patches/server/0023-KeYi-Player-Skull-API.patch
View File

@@ -7,10 +7,10 @@ Original license: MIT
Original project: https://github.com/KeYiMC/KeYi Original project: https://github.com/KeYiMC/KeYi
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 1bada55af5d16437da4d16f9ded55f88a6121eb4..3d33861323a0472322ea50a61892798a91b1bd74 100644 index c8d8ab8e5d8d0a986ff023ce1e195667472d7798..b44e3c4fed830ead7c786ed7b3fad4789f185ead 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -26,6 +26,11 @@ import java.util.Optional; @@ -25,6 +25,11 @@ import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.WeakHashMap; import java.util.WeakHashMap;
@@ -22,7 +22,7 @@ index 1bada55af5d16437da4d16f9ded55f88a6121eb4..3d33861323a0472322ea50a61892798a
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@@ -147,6 +152,7 @@ import org.bukkit.event.player.PlayerUnregisterChannelEvent; @@ -148,6 +153,7 @@ import org.bukkit.event.player.PlayerUnregisterChannelEvent;
import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.InventoryView.Property; import org.bukkit.inventory.InventoryView.Property;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@@ -30,7 +30,7 @@ index 1bada55af5d16437da4d16f9ded55f88a6121eb4..3d33861323a0472322ea50a61892798a
import org.bukkit.map.MapCursor; import org.bukkit.map.MapCursor;
import org.bukkit.map.MapView; import org.bukkit.map.MapView;
import org.bukkit.metadata.MetadataValue; import org.bukkit.metadata.MetadataValue;
@@ -3148,4 +3154,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -3188,4 +3194,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.spigot; return this.spigot;
} }
// Spigot end // Spigot end

6
patches/server/0029-Petal-reduce-work-done-by-game-event-system.patch
View File

@@ -29,7 +29,7 @@ index 902f2b39104bf059849228829bfe93b6dbc757d4..088bc38bfe82532a9ec80a96de8178de
org.bukkit.craftbukkit.event.CraftEventFactory.sourceBlockOverride = blockEntity.getBlockPos(); // CraftBukkit - SPIGOT-7068: Add source block override, not the most elegant way but better than passing down a BlockPosition up to five methods deep. org.bukkit.craftbukkit.event.CraftEventFactory.sourceBlockOverride = blockEntity.getBlockPos(); // CraftBukkit - SPIGOT-7068: Add source block override, not the most elegant way but better than passing down a BlockPosition up to five methods deep.
blockEntity.sculkSpreader.updateCursors(world, pos, world.getRandom(), true); blockEntity.sculkSpreader.updateCursors(world, pos, world.getRandom(), true);
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
index 3a31efd270ddd563b8f2aa27e915bc86a5896623..19d9fbdef2c2038f70d883affb9f5a2e6705e6d1 100644 index 43c3ff92bad2b812fbad9af65bde17681690a72e..0e49273a3a37f8c5aae87e888a3248040b4ddf8f 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -83,7 +83,18 @@ public class LevelChunk extends ChunkAccess { @@ -83,7 +83,18 @@ public class LevelChunk extends ChunkAccess {
@@ -61,7 +61,7 @@ index 3a31efd270ddd563b8f2aa27e915bc86a5896623..19d9fbdef2c2038f70d883affb9f5a2e
Heightmap.Types[] aheightmap_type = Heightmap.Types.values(); Heightmap.Types[] aheightmap_type = Heightmap.Types.values();
int j = aheightmap_type.length; int j = aheightmap_type.length;
@@ -445,9 +456,23 @@ public class LevelChunk extends ChunkAccess { @@ -438,9 +449,23 @@ public class LevelChunk extends ChunkAccess {
if (world instanceof ServerLevel) { if (world instanceof ServerLevel) {
ServerLevel worldserver = (ServerLevel) world; ServerLevel worldserver = (ServerLevel) world;
@@ -88,7 +88,7 @@ index 3a31efd270ddd563b8f2aa27e915bc86a5896623..19d9fbdef2c2038f70d883affb9f5a2e
} else { } else {
return super.getListenerRegistry(ySectionCoord); return super.getListenerRegistry(ySectionCoord);
} }
@@ -811,7 +836,7 @@ public class LevelChunk extends ChunkAccess { @@ -804,7 +829,7 @@ public class LevelChunk extends ChunkAccess {
gameeventlistenerregistry.unregister(gameeventlistener); gameeventlistenerregistry.unregister(gameeventlistener);
if (gameeventlistenerregistry.isEmpty()) { if (gameeventlistenerregistry.isEmpty()) {

12
patches/server/0032-Slice-Smooth-Teleports.patch
View File

@@ -7,10 +7,10 @@ Original license: MIT
Original project: https://github.com/Cryptite/Slice Original project: https://github.com/Cryptite/Slice
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index b9b16f566103798c95592b2921b48a2585a65e73..fc1209030fc72a1160899fbb795a1c1a38e95c59 100644 index 24ed77ffa334269c56cf2796ff9da9045826ae5c..0905b7e0eb8c83559c8bf061e7c21ef4db9bbcd7 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -275,6 +275,7 @@ public class ServerPlayer extends Player { @@ -276,6 +276,7 @@ public class ServerPlayer extends Player {
public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
@@ -19,10 +19,10 @@ index b9b16f566103798c95592b2921b48a2585a65e73..fc1209030fc72a1160899fbb795a1c1a
private boolean compassBar = false; // Purpur private boolean compassBar = false; // Purpur
private boolean ramBar = false; // Purpur private boolean ramBar = false; // Purpur
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index bbd2e5cba28b6eded49c6bb70db24f2e0d7a5e84..3da4681415fed78d964218fdea4da0e49ea54c07 100644 index a722d4d1f4320b02ad2cbc22c45020b9797f7e6c..5648dee94e4be15d28ccbef9640cd9f6567e7b54 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java --- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -982,12 +982,12 @@ public abstract class PlayerList { @@ -987,12 +987,12 @@ public abstract class PlayerList {
int i = flag ? 1 : 0; int i = flag ? 1 : 0;
// CraftBukkit start // CraftBukkit start
LevelData worlddata = worldserver1.getLevelData(); LevelData worlddata = worldserver1.getLevelData();
@@ -38,10 +38,10 @@ index bbd2e5cba28b6eded49c6bb70db24f2e0d7a5e84..3da4681415fed78d964218fdea4da0e4
// entityplayer1.connection.teleport(entityplayer1.getX(), entityplayer1.getY(), entityplayer1.getZ(), entityplayer1.getYRot(), entityplayer1.getXRot()); // entityplayer1.connection.teleport(entityplayer1.getX(), entityplayer1.getY(), entityplayer1.getZ(), entityplayer1.getYRot(), entityplayer1.getXRot());
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3d33861323a0472322ea50a61892798a91b1bd74..9a7419eb920f76b46605dbe00f7aeacece5282c2 100644 index b44e3c4fed830ead7c786ed7b3fad4789f185ead..b86d8a314234fbe3e80fe1133f3268bed78c8b8e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1246,6 +1246,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1269,6 +1269,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Paper end // Paper end
} }

10
patches/server/0035-Pufferfish-Dynamic-Activation-of-Brain.patch
View File

@@ -30,7 +30,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 3f2ee95747ea79ace0329d03038f67a80b0c89ff..797e0aed19876b3a36f7c645b88e2ec1d361ced0 100644 index 35332bc7e1781086829161131692570c812761fa..a35b4cd6d39db8f7c1912416a844639381b4f3fc 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -934,6 +934,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -934,6 +934,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -42,7 +42,7 @@ index 3f2ee95747ea79ace0329d03038f67a80b0c89ff..797e0aed19876b3a36f7c645b88e2ec1
if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
entity.discard(); entity.discard();
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 1544c29011ec8d2074dc2e1e107a6e32f351d7c4..d1b20fd95dd078a89b9f2f0b58710cebdd53fb55 100644 index ca81a4d7119d8b228d6db2f05e2d7f682af67cc3..766f90e2e0a15ce2102623fb4bef2f8378faab31 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -125,6 +125,7 @@ import net.minecraft.world.phys.shapes.Shapes; @@ -125,6 +125,7 @@ import net.minecraft.world.phys.shapes.Shapes;
@@ -376,7 +376,7 @@ index 698c59a3a334f6e70d15016542a03567cab17a96..c767c8a5407548c177b9be1418b4ac57
public static String commandTPSBarOutput = "<green>Tpsbar toggled <onoff> for <target>"; public static String commandTPSBarOutput = "<green>Tpsbar toggled <onoff> for <target>";
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 8a6bc6d4dc5825e0d125ce3853bd3d7714ac113f..cc74389fdfa2b0466b47a95dd5a4fb34dc3b4f85 100644 index 754c8ab99b908b017b9ef4ceaa3ae67c7266ac44..ff247e28fef12d7cd18175b65811fb97a2828dad 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java --- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -38,7 +38,11 @@ import co.aikar.timings.MinecraftTimings; @@ -38,7 +38,11 @@ import co.aikar.timings.MinecraftTimings;
@@ -391,7 +391,7 @@ index 8a6bc6d4dc5825e0d125ce3853bd3d7714ac113f..cc74389fdfa2b0466b47a95dd5a4fb34
public class ActivationRange public class ActivationRange
{ {
@@ -230,6 +234,25 @@ public class ActivationRange @@ -231,6 +235,25 @@ public class ActivationRange
for (int i = 0; i < entities.size(); i++) { for (int i = 0; i < entities.size(); i++) {
Entity entity = entities.get(i); Entity entity = entities.get(i);
ActivationRange.activateEntity(entity); ActivationRange.activateEntity(entity);
@@ -417,7 +417,7 @@ index 8a6bc6d4dc5825e0d125ce3853bd3d7714ac113f..cc74389fdfa2b0466b47a95dd5a4fb34
} }
// Paper end // Paper end
} }
@@ -246,12 +269,12 @@ public class ActivationRange @@ -247,12 +270,12 @@ public class ActivationRange
if ( MinecraftServer.currentTick > entity.activatedTick ) if ( MinecraftServer.currentTick > entity.activatedTick )
{ {
if ( entity.defaultActivationState ) if ( entity.defaultActivationState )

4
patches/server/0040-Leaves-Server-Utils.patch
View File

@@ -33,7 +33,7 @@ index 46954db7ecd35ac4018fdf476df7c8020d7ce6c8..044c51ebb058fc36074fd178929e3279
public PlayerAreaMap() { public PlayerAreaMap() {
super(); super();
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index da3f2b08a1c9a9c58ee0a5e557165014b3744dfb..5b61037b047aaad2d58d11226283e8e79d94d9ee 100644 index 2b9d26cac40361c76463790351b736e9ed9ac78d..be391c31f10addb77799d195d8bac65f6bcd1dbc 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -401,6 +401,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -401,6 +401,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -64,7 +64,7 @@ index da3f2b08a1c9a9c58ee0a5e557165014b3744dfb..5b61037b047aaad2d58d11226283e8e7
} catch (Throwable throwable) { } catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT"); CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
@@ -4767,4 +4774,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -4773,4 +4780,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this); return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
} }
// Paper end // Paper end

12
patches/server/0041-Leaves-Jade-Protocol.patch
View File

@@ -9,10 +9,10 @@ Original project: https://github.com/LeavesMC/Leaves
This patch is Powered by Jade(https://github.com/Snownee/Jade) This patch is Powered by Jade(https://github.com/Snownee/Jade)
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 441d5ed7f48a3725a0a50441eaa8ab68ce1025d8..31c80d1bce5e4721d8d0f45c28fbb3f5842416d4 100644 index ba675f2da807b049aa176400326436a50809b373..ffde14fdcec651441f01c3c484ec38d62276096a 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -248,6 +248,7 @@ import org.bukkit.inventory.CraftingInventory; @@ -249,6 +249,7 @@ import org.bukkit.inventory.CraftingInventory;
import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.InventoryView;
import org.bukkit.inventory.SmithingInventory; import org.bukkit.inventory.SmithingInventory;
@@ -20,7 +20,7 @@ index 441d5ed7f48a3725a0a50441eaa8ab68ce1025d8..31c80d1bce5e4721d8d0f45c28fbb3f5
// CraftBukkit end // CraftBukkit end
public class ServerGamePacketListenerImpl implements ServerPlayerConnection, TickablePacketListener, ServerGamePacketListener { public class ServerGamePacketListenerImpl implements ServerPlayerConnection, TickablePacketListener, ServerGamePacketListener {
@@ -3619,6 +3620,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -3629,6 +3630,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
} }
// Paper end // Paper end
this.cserver.getMessenger().dispatchIncomingMessage(this.player.getBukkitEntity(), packet.identifier.toString(), data); this.cserver.getMessenger().dispatchIncomingMessage(this.player.getBukkitEntity(), packet.identifier.toString(), data);
@@ -31,10 +31,10 @@ index 441d5ed7f48a3725a0a50441eaa8ab68ce1025d8..31c80d1bce5e4721d8d0f45c28fbb3f5
ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex); ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 3da4681415fed78d964218fdea4da0e49ea54c07..b468875a3abc15127737f02f73cd4379d8e2fe08 100644 index 5648dee94e4be15d28ccbef9640cd9f6567e7b54..e9372102f70ab6372da05630611f16add4ade063 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java --- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -395,6 +395,8 @@ public abstract class PlayerList { @@ -400,6 +400,8 @@ public abstract class PlayerList {
player.didPlayerJoinEvent = true; // Gale - EMC - do not process chat/commands before player has joined player.didPlayerJoinEvent = true; // Gale - EMC - do not process chat/commands before player has joined
@@ -57,7 +57,7 @@ index 561ccb25a5c50a51879f0a2b8e4cb90c29ac6d0b..4c3ee6789ea6234848d6ac221f20db71
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2935b3d08fc186abd191f2f2c6f5157cfc45da6b..99092cca24f365210f64cbec2dcb382e9a7a33fa 100644 index 294083bdf24edee846a33cc6957b780f221e9466..86e05b327a8b0b33a2b2e7a0565c9c0ffcb68a02 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -248,6 +248,7 @@ import org.bukkit.scoreboard.Criteria; @@ -248,6 +248,7 @@ import org.bukkit.scoreboard.Criteria;

10
patches/server/0042-Leaves-Appleskin-Protocol.patch
View File

@@ -7,7 +7,7 @@ Original license: GPLv3
Original project: https://github.com/LeavesMC/Leaves Original project: https://github.com/LeavesMC/Leaves
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index a79ba57645defd1d72a8640e33b5c96c073d9145..1f305d29037a5abb0dcbb9d2645ba4485e458249 100644 index 73f4f0ea032400d1326f220c9d287aeac0f9b201..b57a5920b030ca714d6474ca2827afa0e581d07d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1622,6 +1622,7 @@ public abstract class MinecraftServer extends MinecraftServerBlockableEventLoop @@ -1622,6 +1622,7 @@ public abstract class MinecraftServer extends MinecraftServerBlockableEventLoop
@@ -32,10 +32,10 @@ index a79ba57645defd1d72a8640e33b5c96c073d9145..1f305d29037a5abb0dcbb9d2645ba448
// Gale end - split tick steps // Gale end - split tick steps
MinecraftTimings.tickablesTimer.startTiming(); // Spigot // Paper MinecraftTimings.tickablesTimer.startTiming(); // Spigot // Paper
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index b468875a3abc15127737f02f73cd4379d8e2fe08..dc39a0aff743b62fa6209dc80bb9a9b4b3719d6d 100644 index e9372102f70ab6372da05630611f16add4ade063..5007b38f5947f1a12bf1ed56cf974ad77415f08b 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java --- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -396,6 +396,7 @@ public abstract class PlayerList { @@ -401,6 +401,7 @@ public abstract class PlayerList {
player.didPlayerJoinEvent = true; // Gale - EMC - do not process chat/commands before player has joined player.didPlayerJoinEvent = true; // Gale - EMC - do not process chat/commands before player has joined
top.leavesmc.leaves.protocol.JadeProtocol.onPlayerJoin(player); // Leaves - Jade top.leavesmc.leaves.protocol.JadeProtocol.onPlayerJoin(player); // Leaves - Jade
@@ -43,7 +43,7 @@ index b468875a3abc15127737f02f73cd4379d8e2fe08..dc39a0aff743b62fa6209dc80bb9a9b4
final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage(); final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
@@ -646,6 +647,7 @@ public abstract class PlayerList { @@ -651,6 +652,7 @@ public abstract class PlayerList {
return this.remove(entityplayer, net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : PaperAdventure.asAdventure(entityplayer.getDisplayName()))); return this.remove(entityplayer, net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : PaperAdventure.asAdventure(entityplayer.getDisplayName())));
} }
public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) { public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) {
@@ -52,7 +52,7 @@ index b468875a3abc15127737f02f73cd4379d8e2fe08..dc39a0aff743b62fa6209dc80bb9a9b4
BossBarTask.removeFromAll(entityplayer.getBukkitEntity()); // Purpur BossBarTask.removeFromAll(entityplayer.getBukkitEntity()); // Purpur
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 99092cca24f365210f64cbec2dcb382e9a7a33fa..43c9cd3d48e2d6cb4589bebaf9597717d221b9f8 100644 index 86e05b327a8b0b33a2b2e7a0565c9c0ffcb68a02..b501087a9ec6738afac3c8fc8acb446fff45eed8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -970,6 +970,13 @@ public final class CraftServer implements Server { @@ -970,6 +970,13 @@ public final class CraftServer implements Server {

4
patches/server/0043-Leaves-Xaero-Map-Protocol.patch
View File

@@ -7,10 +7,10 @@ Original license: GPLv3
Original project: https://github.com/LeavesMC/Leaves Original project: https://github.com/LeavesMC/Leaves
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index dc39a0aff743b62fa6209dc80bb9a9b4b3719d6d..ba33c2cee4e205622f3199945430be409d132d99 100644 index 5007b38f5947f1a12bf1ed56cf974ad77415f08b..7d3038170183971034d5cc445c085cddd9e3ac9c 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java --- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1369,6 +1369,7 @@ public abstract class PlayerList { @@ -1374,6 +1374,7 @@ public abstract class PlayerList {
player.connection.send(new ClientboundInitializeBorderPacket(worldborder)); player.connection.send(new ClientboundInitializeBorderPacket(worldborder));
player.connection.send(new ClientboundSetTimePacket(world.getGameTime(), world.getDayTime(), world.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT))); player.connection.send(new ClientboundSetTimePacket(world.getGameTime(), world.getDayTime(), world.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)));
player.connection.send(new ClientboundSetDefaultSpawnPositionPacket(world.getSharedSpawnPos(), world.getSharedSpawnAngle())); player.connection.send(new ClientboundSetDefaultSpawnPositionPacket(world.getSharedSpawnPos(), world.getSharedSpawnAngle()));

3
patches/server/0044-Fix-make-log4j-compatible-with-future-release.patch → patches/server/0044-Fix-Make-log4j-compatible-with-future-release.patch
View File

@@ -1,9 +1,8 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Wed, 26 Apr 2023 01:59:35 -0400 Date: Sun, 30 Apr 2023 06:22:08 -0400
Subject: [PATCH] Fix: Make log4j compatible with future release Subject: [PATCH] Fix: Make log4j compatible with future release
This patch fixes the warnning "WARN StatusConsoleListener The use of package scanning to locate plugins is deprecated and will be removed in a future release" during server launching.
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 74ccc67e3c12dc5182602fb691ef3ddeb5b53280..9804bcae3439aaf9a9d477f9ab2494caa899ec1e 100644 index 74ccc67e3c12dc5182602fb691ef3ddeb5b53280..9804bcae3439aaf9a9d477f9ab2494caa899ec1e 100644