From 34f9f1abdb0db02b0717b76c6470d9890b84b290 Mon Sep 17 00:00:00 2001 From: Martijn Muijsers Date: Thu, 21 Sep 2023 20:37:59 +0200 Subject: [PATCH] Updated Upstream (Paper) --- gradle.properties | 2 +- ...Hide-irrelevant-compilation-warnings.patch | 4 ++-- patches/api/0005-SIMD-support.patch | 4 ++-- .../server/0006-Gale-branding-changes.patch | 12 +++++------ .../server/0008-Gale-semantic-version.patch | 4 ++-- patches/server/0009-Gale-configuration.patch | 8 ++++---- .../0012-Include-time-in-startup-logs.patch | 4 ++-- .../server/0018-Remove-vanilla-profiler.patch | 10 +++++----- ...e-for-plugins-not-shutting-down-task.patch | 4 ++-- ...reams-and-iterators-from-range-check.patch | 6 +++--- .../0057-Do-not-log-invalid-statistics.patch | 4 ++-- ...58-Do-not-log-empty-message-warnings.patch | 4 ++-- ...ot-log-out-of-order-message-warnings.patch | 4 ++-- .../0066-Do-not-log-Not-Secure-marker.patch | 6 +++--- .../0083-Reduce-array-allocations.patch | 20 +++++++++---------- .../server/0084-Optimize-sun-burn-tick.patch | 4 ++-- ...116-Send-multiple-keep-alive-packets.patch | 4 ++-- ...ax-interaction-distance-configurable.patch | 4 ++-- .../0127-CraftBukkit-UUID-to-world-map.patch | 8 ++++---- .../0129-Specific-interval-TPS-API.patch | 4 ++-- .../server/0130-5-second-TPS-average.patch | 4 ++-- patches/server/0132-Last-tick-time-API.patch | 4 ++-- .../0137-Optimize-matching-item-checks.patch | 4 ++-- settings.gradle.kts | 1 + 24 files changed, 67 insertions(+), 66 deletions(-) diff --git a/gradle.properties b/gradle.properties index e08ea16..b54573a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=org.galemc.gale version=1.20.1-R0.1-SNAPSHOT mcVersion=1.20.1 -paperRef=29d1c7b60244bb002d29a5dcfc9c995019f550ab +paperRef=3fd1502717e753405a74fbad4a16d2fd7a14187b org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/0001-Hide-irrelevant-compilation-warnings.patch b/patches/api/0001-Hide-irrelevant-compilation-warnings.patch index 31dc9ce..4902955 100644 --- a/patches/api/0001-Hide-irrelevant-compilation-warnings.patch +++ b/patches/api/0001-Hide-irrelevant-compilation-warnings.patch @@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/build.gradle.kts b/build.gradle.kts -index 149f9088fe806467656e8b1c4157df60fda69ba7..8825fd8ff27ba641deaa61c8a5cadb2b236b6512 100644 +index 460bd4029b5a01e39b2322e69aecc128a073ee3a..96b612bc8083eb077151d9e024e0eecb5c6b1eec 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -89,6 +89,15 @@ val generateApiVersioningFile by tasks.registering { @@ -26,7 +26,7 @@ index 149f9088fe806467656e8b1c4157df60fda69ba7..8825fd8ff27ba641deaa61c8a5cadb2b tasks.jar { from(generateApiVersioningFile.map { it.outputs.files.singleFile }) { into("META-INF/maven/${project.group}/${project.name}") -@@ -141,6 +150,8 @@ tasks.withType { +@@ -146,6 +155,8 @@ tasks.withType { into("build/docs/javadoc") } } diff --git a/patches/api/0005-SIMD-support.patch b/patches/api/0005-SIMD-support.patch index 5699ec6..99b6315 100644 --- a/patches/api/0005-SIMD-support.patch +++ b/patches/api/0005-SIMD-support.patch @@ -13,7 +13,7 @@ As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/build.gradle.kts b/build.gradle.kts -index c6acd641d1d76478a3c0063206f162414db69b7a..de92727565e7ab53645f53da4a73e3b2ea6cf8ca 100644 +index b7a9ee2e561da30d48f9ff1c00cacd1fcf9c6977..340db3dd7fddcc95c51c0e956bf1164f6113068a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -95,6 +95,7 @@ tasks.withType { @@ -24,7 +24,7 @@ index c6acd641d1d76478a3c0063206f162414db69b7a..de92727565e7ab53645f53da4a73e3b2 } // Gale end - hide irrelevant compilation warnings -@@ -158,6 +159,7 @@ tasks.withType { +@@ -163,6 +164,7 @@ tasks.withType { } options.addStringOption("Xdoclint:none", "-quiet") // Gale - hide irrelevant compilation warnings diff --git a/patches/server/0006-Gale-branding-changes.patch b/patches/server/0006-Gale-branding-changes.patch index 4f17ef8..419984f 100644 --- a/patches/server/0006-Gale-branding-changes.patch +++ b/patches/server/0006-Gale-branding-changes.patch @@ -221,7 +221,7 @@ index 94a9ed024d3859793618152ea559a168bbcbb5e2..e60008693e017bec1b4eb49c84be3898 -. +. diff --git a/build.gradle.kts b/build.gradle.kts -index 123c2c1bdc4ba5b887910bc613a43bc60be1c99e..9606c6954f2c53dbbda7e7235cf37308822fea02 100644 +index f1873e896d0ac0b943e08564aea4d35ebbd5896f..b36949c1b5bd2c5af1ee7496c8b8372fe263ad79 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -88,7 +88,7 @@ tasks.jar { @@ -233,9 +233,9 @@ index 123c2c1bdc4ba5b887910bc613a43bc60be1c99e..9606c6954f2c53dbbda7e7235cf37308 "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -228,3 +228,22 @@ tasks.registerRunTask("runDev") { - description = "Spin up a non-relocated Mojang-mapped test server" - classpath(sourceSets.main.map { it.runtimeClasspath }) +@@ -235,3 +235,22 @@ tasks.registerRunTask("runDev") { + classpath(runtimeClasspathForRunDev) + jvmArgs("-DPaper.isRunDev=true") } + +// Gale start - package license into jar @@ -455,7 +455,7 @@ index 67ee3a4ca8a6cdeb275653d492a1fea8037c51fb..3f31b91ac6c9cb4d2b19536b6a6a2ab0 public SystemReport fillSystemReport(SystemReport details) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ec4b73321205b472f19fa5bd4ad95893020d1340..0f2d8cc6d8a6f6fb53658c0f49de3b76cc716ea1 100644 +index 1150a114e56899758264aa678db4e9ec3e78befc..a566fd576c0b82a6fd3ea8182d08bdd23370fed0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -265,7 +265,7 @@ import javax.annotation.Nullable; // Paper @@ -709,7 +709,7 @@ index 0000000000000000000000000000000000000000..9b4bc17fed9dc7251159687082cf8de6 + +} diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 98fba0288be9ed2cb18ffba5cf81148157dd4fcf..08bdaab86269b0a24e61b3c9d69c18aca1a1d1f7 100644 +index 50c72e5db369a180f425eaaa0411cb8871bc3463..b66caf636cbb4b6a56584ad710600ad2c3fb17d2 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -155,14 +155,20 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa diff --git a/patches/server/0008-Gale-semantic-version.patch b/patches/server/0008-Gale-semantic-version.patch index 3a49c40..05c647b 100644 --- a/patches/server/0008-Gale-semantic-version.patch +++ b/patches/server/0008-Gale-semantic-version.patch @@ -29,7 +29,7 @@ index 2868dab7b100d9c325b0e5056f86660d631dec4b..2acad4c3fd58178b0f8b22bdb04eeeeb } diff --git a/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java b/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java new file mode 100644 -index 0000000000000000000000000000000000000000..da57462950965fe3bcb7f08e2ba9f15e4508876a +index 0000000000000000000000000000000000000000..36d8caeb8b2f772389c86c2242d09621ec07c7f4 --- /dev/null +++ b/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java @@ -0,0 +1,37 @@ @@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..da57462950965fe3bcb7f08e2ba9f15e + * The patch version is incremented for small changes that do not affect the goal of any feature, + * such as bug fixes, performance improvements or changes in wording. + */ -+ public static final @NotNull String version = "0.6.10"; ++ public static final @NotNull String version = "0.6.11"; + + /** + * The "major.minor" portion of the {@link #version}. diff --git a/patches/server/0009-Gale-configuration.patch b/patches/server/0009-Gale-configuration.patch index 2eb0512..091c61e 100644 --- a/patches/server/0009-Gale-configuration.patch +++ b/patches/server/0009-Gale-configuration.patch @@ -381,7 +381,7 @@ index 18aac3da3c88f33b1a71a5920a8daa27e9723913..513916690d2579760f59edecb1a273f4 this.convertable = convertable_conversionsession; this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile()); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 773bfdd3ed457a352b5329f280c0d10297d579ba..d37848e2b361f5c3a893036c8710a3b41622d7f2 100644 +index 7d54c79f46f99f5500e9cb1f486037cafb27ee3a..76180ed9a5ff711e570f78d89f2d42729e481499 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -1,10 +1,7 @@ @@ -457,10 +457,10 @@ index 773bfdd3ed457a352b5329f280c0d10297d579ba..d37848e2b361f5c3a893036c8710a3b4 this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0f2d8cc6d8a6f6fb53658c0f49de3b76cc716ea1..04dfa4f59921ec5fcea6fb6989847fc5164ccfda 100644 +index a566fd576c0b82a6fd3ea8182d08bdd23370fed0..93a4415ee80a01eb494c8c86d2d94b2bdf1da9a8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1057,6 +1057,7 @@ public final class CraftServer implements Server { +@@ -1035,6 +1035,7 @@ public final class CraftServer implements Server { org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot this.console.paperConfigurations.reloadConfigs(this.console); @@ -468,7 +468,7 @@ index 0f2d8cc6d8a6f6fb53658c0f49de3b76cc716ea1..04dfa4f59921ec5fcea6fb6989847fc5 for (ServerLevel world : this.console.getAllLevels()) { // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean)) -@@ -2932,6 +2933,14 @@ public final class CraftServer implements Server { +@@ -2910,6 +2911,14 @@ public final class CraftServer implements Server { return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console); } diff --git a/patches/server/0012-Include-time-in-startup-logs.patch b/patches/server/0012-Include-time-in-startup-logs.patch index 5d1f36c..dafec6c 100644 --- a/patches/server/0012-Include-time-in-startup-logs.patch +++ b/patches/server/0012-Include-time-in-startup-logs.patch @@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 776b7fc26fe96b69be260bbd36efae147d988640..98eb3f64f9e057564ad041085d1676945a1ac182 100644 +index 7c29d92362a82330440dff151bcf421f15c68f71..28d7bee4a69cb354dbe4d56c7ee9021b2e574b40 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -2,6 +2,7 @@ package org.bukkit.craftbukkit; @@ -45,7 +45,7 @@ index 776b7fc26fe96b69be260bbd36efae147d988640..98eb3f64f9e057564ad041085d167694 public static void main(String[] args) { // Paper start final String warnWhenLegacyFormattingDetected = String.join(".", "net", "kyori", "adventure", "text", "warnWhenLegacyFormattingDetected"); -@@ -306,13 +327,13 @@ public class Main { +@@ -314,13 +335,13 @@ public class Main { String javaInfo = "Java " + runtimeMX.getSpecVersion() + " (" + runtimeMX.getVmName() + " " + runtimeMX.getVmVersion() + ")"; String osInfo = "Host: " + osMX.getName() + " " + osMX.getVersion() + " (" + osMX.getArch() + ")"; diff --git a/patches/server/0018-Remove-vanilla-profiler.patch b/patches/server/0018-Remove-vanilla-profiler.patch index c146d23..c3c4ac2 100644 --- a/patches/server/0018-Remove-vanilla-profiler.patch +++ b/patches/server/0018-Remove-vanilla-profiler.patch @@ -496,7 +496,7 @@ index 4a610b712acfe0b1b4dcf4988bc22c6a71616050..e49e1f2afdade4dc16aa5239d60c0dcf ++j; diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 65d947df910d60f478e7a449eb161e5105e2c0c9..a9e79b340814dfb2d60d51332a8a581298015e4f 100644 +index fb6cbcc4839aef7dc4bd4a49613f892b07aab353..014198da4981b9e1f2e3eec95bfea66be54168e6 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -75,7 +75,6 @@ import net.minecraft.server.level.progress.ChunkProgressListener; @@ -507,7 +507,7 @@ index 65d947df910d60f478e7a449eb161e5105e2c0c9..a9e79b340814dfb2d60d51332a8a5812 import net.minecraft.util.thread.BlockableEventLoop; import net.minecraft.util.thread.ProcessorHandle; import net.minecraft.util.thread.ProcessorMailbox; -@@ -637,20 +636,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -640,20 +639,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } protected void tick(BooleanSupplier shouldKeepTicking) { @@ -883,7 +883,7 @@ index b382da838acc04a1c5d89064b4fa43bcdd38ae71..e4f35f91a1b1b4c42c09602c19129fe4 this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities())); playerlist.sendLevelInfo(this, worldserver); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3c0651fa5a5db880202c9a3805a6455269c5f16d..c513978f5de138353ca32e264cc5b06ba664a041 100644 +index ab58827001b3b42e44d7f701c390480fed1fa1f1..59499e1c55fe40d719b2281febb6ef0a0cad6c2d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -397,7 +397,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -1187,7 +1187,7 @@ index 78c98f38bc263664ea4cd344670243a7d372885c..e832b6ce0e253a5696b50ee5956ef697 if (((ServerLevel) this.level()).hasEntityMoveEvent && !(this instanceof net.minecraft.world.entity.player.Player)) { if (this.xo != this.getX() || this.yo != this.getY() || this.zo != this.getZ() || this.yRotO != this.getYRot() || this.xRotO != this.getXRot()) { diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index e2a25c29ec74147b3e66aa0b3deb85a8f6ee53a5..3bc50cc77bc8723dd607134f795aae55784aa657 100644 +index a99d737f71277ea3082816c7a7fc47ab3a201d30..d00ce4ce7296fb0b647a82f231ce7d45b22a2ee2 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -143,8 +143,10 @@ public abstract class Mob extends LivingEntity implements Targeting { @@ -1607,7 +1607,7 @@ index 8f97c9df726ac20cfce7bdddd5dd4f8c5aa76c35..8f2c0dcb0ca69ea1b09bb055c6a94949 } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index d37848e2b361f5c3a893036c8710a3b41622d7f2..0097cc2d0856d782764d3a128f14440aed805bdb 100644 +index 76180ed9a5ff711e570f78d89f2d42729e481499..fdd0f3baf70779825ef1f7d61173bd6f15842319 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -129,7 +129,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0030-Print-stack-trace-for-plugins-not-shutting-down-task.patch b/patches/server/0030-Print-stack-trace-for-plugins-not-shutting-down-task.patch index ace136d..405c1a8 100644 --- a/patches/server/0030-Print-stack-trace-for-plugins-not-shutting-down-task.patch +++ b/patches/server/0030-Print-stack-trace-for-plugins-not-shutting-down-task.patch @@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 04dfa4f59921ec5fcea6fb6989847fc5164ccfda..6d1baf7592a0d016b7d9a842ecc8660c42059490 100644 +index 93a4415ee80a01eb494c8c86d2d94b2bdf1da9a8..4af3c47e8f93220a1740242b21aee96ed1902e0d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1141,6 +1141,13 @@ public final class CraftServer implements Server { +@@ -1119,6 +1119,13 @@ public final class CraftServer implements Server { plugin.getPluginMeta().getDisplayName(), "This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies." )); diff --git a/patches/server/0039-Remove-streams-and-iterators-from-range-check.patch b/patches/server/0039-Remove-streams-and-iterators-from-range-check.patch index f4e38d6..6e7d7b3 100644 --- a/patches/server/0039-Remove-streams-and-iterators-from-range-check.patch +++ b/patches/server/0039-Remove-streams-and-iterators-from-range-check.patch @@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index a9e79b340814dfb2d60d51332a8a581298015e4f..f375c8a3cdc88ee8d1a54fb4663d56d190a62faa 100644 +index 014198da4981b9e1f2e3eec95bfea66be54168e6..307b52d7e812d7e7607fe7e39c19dd2567a0338a 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -1586,8 +1586,30 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1589,8 +1589,30 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider return ChunkMap.this.level.getServer().getScaledTrackingDistance(initialDistance); } @@ -65,7 +65,7 @@ index a9e79b340814dfb2d60d51332a8a581298015e4f..f375c8a3cdc88ee8d1a54fb4663d56d1 Iterator iterator = this.entity.getIndirectPassengers().iterator(); while (iterator.hasNext()) { -@@ -1599,6 +1621,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1602,6 +1624,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider i = j; } } diff --git a/patches/server/0057-Do-not-log-invalid-statistics.patch b/patches/server/0057-Do-not-log-invalid-statistics.patch index 9503b36..ffcb418 100644 --- a/patches/server/0057-Do-not-log-invalid-statistics.patch +++ b/patches/server/0057-Do-not-log-invalid-statistics.patch @@ -13,7 +13,7 @@ As part of: EmpireCraft (https://github.com/starlis/empirecraft) Licensed under: MIT (https://opensource.org/licenses/MIT) diff --git a/src/main/java/net/minecraft/stats/ServerStatsCounter.java b/src/main/java/net/minecraft/stats/ServerStatsCounter.java -index 9501e5f25f5c4d3069e554d4dc82b0e094156682..e81afb79d66321f70eb40c43d3bd7b92a49fa1ac 100644 +index 9bb8d4d7be6a937980aa653db82be084d066a563..33b1845a5cb935382e38268246d7fd729d234eb6 100644 --- a/src/main/java/net/minecraft/stats/ServerStatsCounter.java +++ b/src/main/java/net/minecraft/stats/ServerStatsCounter.java @@ -36,6 +36,7 @@ import net.minecraft.server.level.ServerPlayer; @@ -24,7 +24,7 @@ index 9501e5f25f5c4d3069e554d4dc82b0e094156682..e81afb79d66321f70eb40c43d3bd7b92 import org.slf4j.Logger; public class ServerStatsCounter extends StatsCounter { -@@ -131,15 +132,15 @@ public class ServerStatsCounter extends StatsCounter { +@@ -132,15 +133,15 @@ public class ServerStatsCounter extends StatsCounter { Util.ifElse(this.getStat(statisticwrapper, s2), (statistic) -> { this.stats.put(statistic, nbttagcompound2.getInt(s2)); }, () -> { diff --git a/patches/server/0058-Do-not-log-empty-message-warnings.patch b/patches/server/0058-Do-not-log-empty-message-warnings.patch index 867a128..4db62d2 100644 --- a/patches/server/0058-Do-not-log-empty-message-warnings.patch +++ b/patches/server/0058-Do-not-log-empty-message-warnings.patch @@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 315128d7bcd73ed108f2ae6d7c05b6bec1d8773d..6df1e15af01b694964d1f76330b720ff528253af 100644 +index b80f8a3b734d0f47ecef69fdd22b8a4fc15dfc54..0ae4330f3055e04d577818c1fffe65196e347e53 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -185,6 +185,7 @@ import net.minecraft.world.phys.shapes.BooleanOp; @@ -18,7 +18,7 @@ index 315128d7bcd73ed108f2ae6d7c05b6bec1d8773d..6df1e15af01b694964d1f76330b720ff import org.galemc.gale.configuration.GaleGlobalConfiguration; import org.slf4j.Logger; -@@ -2608,7 +2609,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2587,7 +2588,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic // CraftBukkit start String s = message.signedContent(); if (s.isEmpty()) { diff --git a/patches/server/0065-Do-not-log-out-of-order-message-warnings.patch b/patches/server/0065-Do-not-log-out-of-order-message-warnings.patch index 731aec0..2c5879c 100644 --- a/patches/server/0065-Do-not-log-out-of-order-message-warnings.patch +++ b/patches/server/0065-Do-not-log-out-of-order-message-warnings.patch @@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 6df1e15af01b694964d1f76330b720ff528253af..3bb1b56fc189c0fc3aca2a65155e5ea5eadc7a87 100644 +index 0ae4330f3055e04d577818c1fffe65196e347e53..badc98edc1d42946cabd47d542d8eeb736a6c5e5 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2392,7 +2392,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -17,7 +17,7 @@ index 6df1e15af01b694964d1f76330b720ff528253af..3bb1b56fc189c0fc3aca2a65155e5ea5 - ServerGamePacketListenerImpl.LOGGER.warn("{} sent out-of-order chat: '{}': {} > {}", this.player.getName().getString(), message, this.lastChatTimeStamp.get().getEpochSecond(), timestamp.getEpochSecond()); // Paper + if (GaleGlobalConfiguration.get().logToConsole.chat.outOfOrderMessageWarning) ServerGamePacketListenerImpl.LOGGER.warn("{} sent out-of-order chat: '{}': {} > {}", this.player.getName().getString(), message, this.lastChatTimeStamp.get().getEpochSecond(), timestamp.getEpochSecond()); // Paper // Gale - do not log out-of-order message warnings this.server.scheduleOnMain(() -> { // Paper - push to main - this.disconnect(Component.translatable("multiplayer.disconnect.out_of_order_chat"), org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event ca + this.disconnect(Component.translatable("multiplayer.disconnect.out_of_order_chat"), org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event causes }); // Paper - push to main diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java index 493eca395097691f797cfa47cb6a701f74d0ab14..fc61b3ffc5939590a05ffce81f3b2cf8917d5a32 100644 diff --git a/patches/server/0066-Do-not-log-Not-Secure-marker.patch b/patches/server/0066-Do-not-log-Not-Secure-marker.patch index 1566065..6554b5f 100644 --- a/patches/server/0066-Do-not-log-Not-Secure-marker.patch +++ b/patches/server/0066-Do-not-log-Not-Secure-marker.patch @@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java -index 774fb97912f766589f3548f659618ad554e0503f..bec9a8ca016f23352ba51e5f70ecb9a0b66b0385 100644 +index e4fd372a1d585887287253a02531cd192929377b..397f985756c5bc6c11a32c844d536000dd922ed1 100644 --- a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java +++ b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java -@@ -43,6 +43,7 @@ import org.bukkit.event.player.PlayerChatEvent; +@@ -44,6 +44,7 @@ import org.bukkit.event.player.PlayerChatEvent; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.framework.qual.DefaultQualifier; @@ -18,7 +18,7 @@ index 774fb97912f766589f3548f659618ad554e0503f..bec9a8ca016f23352ba51e5f70ecb9a0 import static net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection; -@@ -353,7 +354,7 @@ public final class ChatProcessor { +@@ -355,7 +356,7 @@ public final class ChatProcessor { private void sendToServer(final ChatType.Bound chatType, final @Nullable Function msgFunction) { final PlayerChatMessage toConsoleMessage = msgFunction == null ? ChatProcessor.this.message : ChatProcessor.this.message.withUnsignedContent(msgFunction.apply(ChatProcessor.this.server.console)); diff --git a/patches/server/0083-Reduce-array-allocations.patch b/patches/server/0083-Reduce-array-allocations.patch index 4508bed..7546ab1 100644 --- a/patches/server/0083-Reduce-array-allocations.patch +++ b/patches/server/0083-Reduce-array-allocations.patch @@ -469,7 +469,7 @@ index efbc8483a51c5272ca81747c82dc65e7f0f5c232..9879599c38db4f3332c347b6b0c26034 return ret; } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3bb1b56fc189c0fc3aca2a65155e5ea5eadc7a87..76bea01e27d4e77296237998f0783565b1c3d1c8 100644 +index badc98edc1d42946cabd47d542d8eeb736a6c5e5..a0f4a867c1b7711322cfca832a2e86a79f114a6e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -29,6 +29,8 @@ import java.util.function.UnaryOperator; @@ -531,7 +531,7 @@ index 3bb1b56fc189c0fc3aca2a65155e5ea5eadc7a87..76bea01e27d4e77296237998f0783565 return; } // Paper end -@@ -3364,7 +3362,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3343,7 +3341,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic // Paper start if (!org.bukkit.Bukkit.isPrimaryThread()) { if (this.recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) { @@ -693,10 +693,10 @@ index 597866e969e0f5deddaaaedd9b1618edd507bae9..d1267b31ec49d3b0faf1fab57fe53f30 for (int j = 0; j < i; ++j) { diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 3bc50cc77bc8723dd607134f795aae55784aa657..fa47779f1007325ee77f2b43195bf1892a2d7d65 100644 +index d00ce4ce7296fb0b647a82f231ce7d45b22a2ee2..ab0aa4b86bf782792177dec7adf8f7ca5599ad22 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -1047,7 +1047,7 @@ public abstract class Mob extends LivingEntity implements Targeting { +@@ -1054,7 +1054,7 @@ public abstract class Mob extends LivingEntity implements Targeting { @Override protected void dropCustomDeathLoot(DamageSource source, int lootingMultiplier, boolean allowDrops) { super.dropCustomDeathLoot(source, lootingMultiplier, allowDrops); @@ -705,7 +705,7 @@ index 3bc50cc77bc8723dd607134f795aae55784aa657..fa47779f1007325ee77f2b43195bf189 int j = aenumitemslot.length; for (int k = 0; k < j; ++k) { -@@ -1109,7 +1109,7 @@ public abstract class Mob extends LivingEntity implements Targeting { +@@ -1116,7 +1116,7 @@ public abstract class Mob extends LivingEntity implements Targeting { } boolean flag = true; @@ -714,7 +714,7 @@ index 3bc50cc77bc8723dd607134f795aae55784aa657..fa47779f1007325ee77f2b43195bf189 int j = aenumitemslot.length; for (int k = 0; k < j; ++k) { -@@ -1196,7 +1196,7 @@ public abstract class Mob extends LivingEntity implements Targeting { +@@ -1203,7 +1203,7 @@ public abstract class Mob extends LivingEntity implements Targeting { float f = localDifficulty.getSpecialMultiplier(); this.enchantSpawnedWeapon(random, f); @@ -723,7 +723,7 @@ index 3bc50cc77bc8723dd607134f795aae55784aa657..fa47779f1007325ee77f2b43195bf189 int i = aenumitemslot.length; for (int j = 0; j < i; ++j) { -@@ -1415,7 +1415,7 @@ public abstract class Mob extends LivingEntity implements Targeting { +@@ -1422,7 +1422,7 @@ public abstract class Mob extends LivingEntity implements Targeting { t0.setInvulnerable(this.isInvulnerable()); if (flag) { t0.setCanPickUpLoot(this.canPickUpLoot()); @@ -746,10 +746,10 @@ index 25ed5571b24e590bc95056020d84496492b53298..087acc992a83b2a7e40a0e24f00e283c for (int j = 0; j < i; ++j) { diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 879cc823d56625867eb73bb621db6a13f40ad81c..3d589c9698129ab2a09093425d0bb97c5a3897f9 100644 +index d138660e459b2d09ba9dd7ae2bf3da499d9ae25c..5530b4916b24c9fb42db0f9f28a282a4b9b90443 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java -@@ -1019,7 +1019,7 @@ public final class ItemStack { +@@ -1020,7 +1020,7 @@ public final class ItemStack { int k; if (ItemStack.shouldShowInTooltip(i, ItemStack.TooltipPart.MODIFIERS)) { @@ -798,7 +798,7 @@ index 2bfbdaeb2b0d99dfd956cd5936403fe8b0eeae64..84f1c4c3ded4f201899f3c74e639349b public Enchantments() {} diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 761e3c07726bdead7acf9769b9a973750b7d0335..aaa83188bc5c9da1ab7a50bd3f97a420e242a714 100644 +index 10770a2ff21b3dc4ec8ea413a1be68a27f83022f..bf19dbc64090a14b30d47687c66bf92bf3417ac6 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -12,6 +12,8 @@ import java.util.function.Consumer; diff --git a/patches/server/0084-Optimize-sun-burn-tick.patch b/patches/server/0084-Optimize-sun-burn-tick.patch index 0f98fad..0617eb1 100644 --- a/patches/server/0084-Optimize-sun-burn-tick.patch +++ b/patches/server/0084-Optimize-sun-burn-tick.patch @@ -45,10 +45,10 @@ index 19d05bfec4aafdf3712ad24b4b29a9f55067e578..1b0a01a120bc02d82263ac2753dc8447 this.absMoveTo(x, y, z); this.setYRot(yaw % 360.0F); diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index fa47779f1007325ee77f2b43195bf1892a2d7d65..035a0a8620fc46dbf026c65ccf2542d9f49e22b0 100644 +index ab0aa4b86bf782792177dec7adf8f7ca5599ad22..2ea1916ef44d1cd5920351c0c6566d4714653488 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -1671,13 +1671,29 @@ public abstract class Mob extends LivingEntity implements Targeting { +@@ -1678,13 +1678,29 @@ public abstract class Mob extends LivingEntity implements Targeting { } diff --git a/patches/server/0116-Send-multiple-keep-alive-packets.patch b/patches/server/0116-Send-multiple-keep-alive-packets.patch index 1232e91..3272cac 100644 --- a/patches/server/0116-Send-multiple-keep-alive-packets.patch +++ b/patches/server/0116-Send-multiple-keep-alive-packets.patch @@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 76bea01e27d4e77296237998f0783565b1c3d1c8..819909fcb754b511fb9932926f73675a02dafbab 100644 +index a0f4a867c1b7711322cfca832a2e86a79f114a6e..6925b841dd5f573fee9ef930d27b79fe8284f4d5 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -7,6 +7,8 @@ import com.mojang.brigadier.StringReader; @@ -91,7 +91,7 @@ index 76bea01e27d4e77296237998f0783565b1c3d1c8..819909fcb754b511fb9932926f73675a if (this.keepAlivePending) { if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info -@@ -3556,6 +3577,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3535,6 +3556,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void handleKeepAlive(ServerboundKeepAlivePacket packet) { diff --git a/patches/server/0118-Make-max-interaction-distance-configurable.patch b/patches/server/0118-Make-max-interaction-distance-configurable.patch index c824d5d..8ea1cf4 100644 --- a/patches/server/0118-Make-max-interaction-distance-configurable.patch +++ b/patches/server/0118-Make-max-interaction-distance-configurable.patch @@ -20,7 +20,7 @@ index 618ab9a2903f6d4139acd4aaa2e6db0a26e88ba9..8e851f6f5d72f3d1d35d5e0a9bcabaf4 this.debugLogging(pos, false, sequence, "too far"); } else if (pos.getY() >= worldHeight) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 819909fcb754b511fb9932926f73675a02dafbab..8171385688405d9f3263c099177bd92e92d55c38 100644 +index 6925b841dd5f573fee9ef930d27b79fe8284f4d5..4a5d64b0b5e176fa15981516ecf44fc46b8f0fd6 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -256,7 +256,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -55,7 +55,7 @@ index 819909fcb754b511fb9932926f73675a02dafbab..8171385688405d9f3263c099177bd92e Vec3 vec3d2 = vec3d.subtract(vec3d1); double d0 = 1.0000001D; -@@ -2888,7 +2895,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2867,7 +2874,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic AABB axisalignedbb = entity.getBoundingBox(); diff --git a/patches/server/0127-CraftBukkit-UUID-to-world-map.patch b/patches/server/0127-CraftBukkit-UUID-to-world-map.patch index 0ff517d..99c4c3d 100644 --- a/patches/server/0127-CraftBukkit-UUID-to-world-map.patch +++ b/patches/server/0127-CraftBukkit-UUID-to-world-map.patch @@ -13,7 +13,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6d1baf7592a0d016b7d9a842ecc8660c42059490..d8e34ad5c2e79a0a766dd1cd33b9f7328b0ef563 100644 +index 4af3c47e8f93220a1740242b21aee96ed1902e0d..7b62a82ecc6fa51ed38bb92f9d00bff66726f3d3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -44,6 +44,9 @@ import java.util.logging.Level; @@ -34,7 +34,7 @@ index 6d1baf7592a0d016b7d9a842ecc8660c42059490..d8e34ad5c2e79a0a766dd1cd33b9f732 private final Map, Registry> registries = new HashMap<>(); private YamlConfiguration configuration; private YamlConfiguration commandsConfiguration; -@@ -1430,6 +1434,7 @@ public final class CraftServer implements Server { +@@ -1408,6 +1412,7 @@ public final class CraftServer implements Server { this.getLogger().log(Level.SEVERE, null, ex); } @@ -42,7 +42,7 @@ index 6d1baf7592a0d016b7d9a842ecc8660c42059490..d8e34ad5c2e79a0a766dd1cd33b9f732 this.worlds.remove(world.getName().toLowerCase(java.util.Locale.ENGLISH)); this.console.removeLevel(handle); return true; -@@ -1448,12 +1453,7 @@ public final class CraftServer implements Server { +@@ -1426,12 +1431,7 @@ public final class CraftServer implements Server { @Override public World getWorld(UUID uid) { @@ -56,7 +56,7 @@ index 6d1baf7592a0d016b7d9a842ecc8660c42059490..d8e34ad5c2e79a0a766dd1cd33b9f732 } // Paper start -@@ -1471,6 +1471,7 @@ public final class CraftServer implements Server { +@@ -1449,6 +1449,7 @@ public final class CraftServer implements Server { System.out.println("World " + world.getName() + " is a duplicate of another world and has been prevented from loading. Please delete the uid.dat file from " + world.getName() + "'s world directory if you want to be able to load the duplicate world."); return; } diff --git a/patches/server/0129-Specific-interval-TPS-API.patch b/patches/server/0129-Specific-interval-TPS-API.patch index 7bd1ed8..1a9a93a 100644 --- a/patches/server/0129-Specific-interval-TPS-API.patch +++ b/patches/server/0129-Specific-interval-TPS-API.patch @@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index d8e34ad5c2e79a0a766dd1cd33b9f7328b0ef563..c451746873a2e4cc79225d91995b10877037bcba 100644 +index 7b62a82ecc6fa51ed38bb92f9d00bff66726f3d3..ea4e524f792f1cabfa11db6543e4ae2f39734913 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2901,6 +2901,25 @@ public final class CraftServer implements Server { +@@ -2879,6 +2879,25 @@ public final class CraftServer implements Server { }; } diff --git a/patches/server/0130-5-second-TPS-average.patch b/patches/server/0130-5-second-TPS-average.patch index c3bc391..6ba015a 100644 --- a/patches/server/0130-5-second-TPS-average.patch +++ b/patches/server/0130-5-second-TPS-average.patch @@ -79,10 +79,10 @@ index 203598a379f944f44ff38bdd2007387cc7bc3176..350d503d7f03c63c0e3e2155a75035b9 tps5.add(currentTps, diff); tps15.add(currentTps, diff); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c451746873a2e4cc79225d91995b10877037bcba..a1802efea9175cb1ffe02c555bee21643f355389 100644 +index ea4e524f792f1cabfa11db6543e4ae2f39734913..87e020d6eecd1f564f24f164d7338b5f21bfa197 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2901,8 +2901,27 @@ public final class CraftServer implements Server { +@@ -2879,8 +2879,27 @@ public final class CraftServer implements Server { }; } diff --git a/patches/server/0132-Last-tick-time-API.patch b/patches/server/0132-Last-tick-time-API.patch index 37ce550..faac4a0 100644 --- a/patches/server/0132-Last-tick-time-API.patch +++ b/patches/server/0132-Last-tick-time-API.patch @@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a1802efea9175cb1ffe02c555bee21643f355389..5d3a5bdd8e223ff45320d3a8ac9e57d5d7ff02bf 100644 +index 87e020d6eecd1f564f24f164d7338b5f21bfa197..36df1adcc2adc40ef04100564650b463f3c64bf6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -3200,4 +3200,22 @@ public final class CraftServer implements Server { +@@ -3178,4 +3178,22 @@ public final class CraftServer implements Server { } // Paper end diff --git a/patches/server/0137-Optimize-matching-item-checks.patch b/patches/server/0137-Optimize-matching-item-checks.patch index 22822d7..82bfa69 100644 --- a/patches/server/0137-Optimize-matching-item-checks.patch +++ b/patches/server/0137-Optimize-matching-item-checks.patch @@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 3d589c9698129ab2a09093425d0bb97c5a3897f9..0116eeff6de9948c398486c4f910d58862f88eb9 100644 +index 5530b4916b24c9fb42db0f9f28a282a4b9b90443..4250b65cca60a8e4f9ea52e216511fbc6ed7293a 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java -@@ -754,15 +754,15 @@ public final class ItemStack { +@@ -755,15 +755,15 @@ public final class ItemStack { } public static boolean matches(ItemStack left, ItemStack right) { diff --git a/settings.gradle.kts b/settings.gradle.kts index c9cb29d..c062a9a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,6 +3,7 @@ import java.util.Locale pluginManagement { repositories { gradlePluginPortal() + maven("https://repo.galemc.org/repository/maven-public/") maven("https://repo.papermc.io/repository/maven-public/") } }