diff --git a/gradle.properties b/gradle.properties index 986bbafd..4fa8dab2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,6 +4,6 @@ version=1.20.4-R0.1-SNAPSHOT mcVersion=1.20.4 packageVersion=1_20_R3 org.gradle.jvmargs=-Xmx2G -paperRef=c5d168cef92148a6799141832fdb5f95732c1a38 +paperRef=cde5587e58f08ce2d8875bb9d13a4be56825e353 preVersion=false updatingMinecraft=false \ No newline at end of file diff --git a/patches/server/0002-Delete-Timings.patch b/patches/server/0002-Delete-Timings.patch index 7b9615a3..38c90750 100644 --- a/patches/server/0002-Delete-Timings.patch +++ b/patches/server/0002-Delete-Timings.patch @@ -1058,7 +1058,7 @@ index 41ae5cccc1388c27a88ab9d142d3e4834c5ab97d..61e0e14b74c6585a9d157cae3db9c5c3 this.profiler.popPush("send chunks"); iterator = this.playerList.getPlayers().iterator(); diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index b164b09c90b607262938f3c2552d6b5790c27786..b0708f5d72a31720e3696ee707ec21229672bcf0 100644 +index 94b0bb1999b47f9777050753d6aff2bc4986d48c..d562b9ce89e510584cf8efc25302a18f6dbf2f2d 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -58,7 +58,6 @@ import org.apache.logging.log4j.Level; @@ -1069,7 +1069,7 @@ index b164b09c90b607262938f3c2552d6b5790c27786..b0708f5d72a31720e3696ee707ec2122 import org.bukkit.event.server.ServerCommandEvent; import org.bukkit.craftbukkit.util.Waitable; // Paper import org.bukkit.event.server.RemoteServerCommandEvent; -@@ -485,7 +484,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -486,7 +485,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface } public void handleConsoleInputs() { @@ -1077,7 +1077,7 @@ index b164b09c90b607262938f3c2552d6b5790c27786..b0708f5d72a31720e3696ee707ec2122 // Paper start - Perf: use proper queue ConsoleInput servercommand; while ((servercommand = this.serverCommandQueue.poll()) != null) { -@@ -502,7 +500,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -503,7 +501,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface // CraftBukkit end } @@ -1085,7 +1085,7 @@ index b164b09c90b607262938f3c2552d6b5790c27786..b0708f5d72a31720e3696ee707ec2122 } @Override -@@ -776,21 +773,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -777,21 +774,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface } // Paper start command.set(event.getCommand()); @@ -1575,10 +1575,10 @@ index 6934e9dac0d69c043b73b7c46d59f2d39b37c67f..8e43a6817e9101b6dcc956e3b6f4bcff } else if (close) { chunkproviderserver.close(false); } // Paper - rewrite chunk system diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2562ea3b63b055319a775c12ff327d127f8039c3..f3b33fca6bc6c9c827cab78488b5aec782e92969 100644 +index a7e40f72a3b56916620a7f089410ec3a6db0cffc..3ac6943913c887b14078aabb2581f7f16deb4b4a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2379,7 +2379,6 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2398,7 +2398,6 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl public void handleCommand(String s) { // Paper - private -> public org.spigotmc.AsyncCatcher.catchOp("Command Dispatched Async: " + s); // Paper - Add async catcher @@ -1586,7 +1586,7 @@ index 2562ea3b63b055319a775c12ff327d127f8039c3..f3b33fca6bc6c9c827cab78488b5aec7 if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s); -@@ -2389,20 +2388,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2408,20 +2407,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl this.cserver.getPluginManager().callEvent(event); if (event.isCancelled()) { @@ -2093,7 +2093,7 @@ index b3e1adeb932da9b3bed16acd94e2f16da48a7c72..e9798517b9211c50a20ea5c69603aab3 } } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index ca5312febcdd467889ad725c0263367bc5fe69f6..e77482def28fbd930b49913fb68f48212bc9b4a8 100644 +index 8036ed91714d638eb2a8e8c2bea4bf62bc18cb57..2a84a653f8b10525f9f6667273295cf92ed71cb1 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -212,7 +212,6 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0005-Leaves-Server-Config-And-Command.patch b/patches/server/0005-Leaves-Server-Config-And-Command.patch index a50f2aeb..4873d73b 100644 --- a/patches/server/0005-Leaves-Server-Config-And-Command.patch +++ b/patches/server/0005-Leaves-Server-Config-And-Command.patch @@ -17,7 +17,7 @@ index 61e0e14b74c6585a9d157cae3db9c5c3a69b393f..2cf51683978e72d552f9148a61070420 org.spigotmc.WatchdogThread.hasStarted = true; // Paper Arrays.fill( this.recentTps, 20 ); diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index b0708f5d72a31720e3696ee707ec21229672bcf0..129c2e6f0cc9d752e7ca5934e13e89358af39180 100644 +index d562b9ce89e510584cf8efc25302a18f6dbf2f2d..1a610cd47fb26b70bc16078adc2c22acff6a9578 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -220,6 +220,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -31,10 +31,10 @@ index b0708f5d72a31720e3696ee707ec21229672bcf0..129c2e6f0cc9d752e7ca5934e13e8935 this.setPvpAllowed(dedicatedserverproperties.pvp); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6bcfd8a1170c3e629574239a0ddad35662eeb218..350830c4875a0834bb5e1d055eaa29f05e8b78b0 100644 +index a3b7d9ef5d9149e04eb69ebc30b59fba3f8f49f0..61f3bf48558eb469778fd33f50de9d5b016bf700 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1064,6 +1064,7 @@ public final class CraftServer implements Server { +@@ -1069,6 +1069,7 @@ public final class CraftServer implements Server { playerMetadata.removeAll(plugin); } // Paper end @@ -42,7 +42,7 @@ index 6bcfd8a1170c3e629574239a0ddad35662eeb218..350830c4875a0834bb5e1d055eaa29f0 this.reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper -@@ -2995,6 +2996,14 @@ public final class CraftServer implements Server { +@@ -3000,6 +3001,14 @@ public final class CraftServer implements Server { { return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console); } diff --git a/patches/server/0006-Leaves-Protocol-Core.patch b/patches/server/0006-Leaves-Protocol-Core.patch index ea7ba1ba..f52b1435 100644 --- a/patches/server/0006-Leaves-Protocol-Core.patch +++ b/patches/server/0006-Leaves-Protocol-Core.patch @@ -23,7 +23,7 @@ index af86f752c33a2990405fea058b7c41c437ba9d46..bada9fae1e7178162429e1f5a1608b9c } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 9d50d30670d9ac0ffa74eb6da2e84b5bd069839c..3ab53e1eee43c048ec89f8bda610e35efa5a52aa 100644 +index 2cf51683978e72d552f9148a610704202d207df5..77e952a502bebfb31311b47ceed0b88118278d4a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1717,6 +1717,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop= world.paperConfig().entities.behavior.playerInsomniaStartTicks) { // Paper - Ability to control player's insomnia and phantoms BlockPos blockposition1 = blockposition.above(20 + randomsource.nextInt(15)).east(-10 + randomsource.nextInt(21)).south(-10 + randomsource.nextInt(21)); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c21cc6231cfd6d542fc0ceaa4d62541709c1e3a8..1c79abf5952c29301bc9d83cd20a81696085fbf0 100644 +index 20414b4cb34b05acf98ea31e2d0e5a4cc7ad515a..f935e286103618401726481b512794430bc26c8a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -259,6 +259,7 @@ import org.yaml.snakeyaml.constructor.SafeConstructor; @@ -366,7 +366,7 @@ index c21cc6231cfd6d542fc0ceaa4d62541709c1e3a8..1c79abf5952c29301bc9d83cd20a8169 // Paper start - Folia region threading API private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler(); -@@ -3238,4 +3240,11 @@ public final class CraftServer implements Server { +@@ -3243,4 +3245,11 @@ public final class CraftServer implements Server { } // Paper end diff --git a/patches/server/0018-No-chat-sign.patch b/patches/server/0018-No-chat-sign.patch index ebeecdcc..1e0b54cd 100644 --- a/patches/server/0018-No-chat-sign.patch +++ b/patches/server/0018-No-chat-sign.patch @@ -102,10 +102,10 @@ index 9d6db4a378036559efab91c8b7dcf2a6b0c2cce6..2c349dc502ce275a8215766933f4855f } } diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 129c2e6f0cc9d752e7ca5934e13e89358af39180..2882d720f2b4fbc5f00cfe45a80f48e7810c1424 100644 +index 1a610cd47fb26b70bc16078adc2c22acff6a9578..def41add94e74f0230031d75aed5a2191810b5c7 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -642,7 +642,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -643,7 +643,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface // Paper start - Add setting for proxy online mode status return dedicatedserverproperties.enforceSecureProfile && io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() @@ -147,7 +147,7 @@ index 8aa1337b420e1c9fbf51f951f14a63d89f61d3f4..19db81d87d1e0eb9716ceaf88dc407db if (packet == null || this.processedDisconnect) { // Spigot return; diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 7612ee6c93c4ad783d71b125ed3b2fe91ab7c166..02427973b52898ab2d87d7585801fe14555d2ae4 100644 +index eb4baddfe05397c52d7722d81dd3078bb23ea077..6a5ff44abca2bf5096bceb4f9ab2454e78b80fea 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1488,7 +1488,7 @@ public abstract class PlayerList { diff --git a/patches/server/0057-Disable-distance-check-for-UseItemOnPacket.patch b/patches/server/0057-Disable-distance-check-for-UseItemOnPacket.patch index 79031c30..e54194b3 100644 --- a/patches/server/0057-Disable-distance-check-for-UseItemOnPacket.patch +++ b/patches/server/0057-Disable-distance-check-for-UseItemOnPacket.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable distance check for UseItemOnPacket diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2d388dcafc02a04348a1c07d970b7a8bb8fdf014..7101ca0ec164784d4be7a7c818131d4d11c69e98 100644 +index 2d0b3ae86a32cf28824a5fdbd3dbf332f571f1e9..853264a6160f933bc08003b5b2e5d4dad6207ed5 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1917,7 +1917,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1936,7 +1936,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl Vec3 vec3d2 = vec3d.subtract(vec3d1); double d0 = 1.0000001D; diff --git a/patches/server/0088-Reduce-array-allocations.patch b/patches/server/0088-Reduce-array-allocations.patch index 74408964..f1942f11 100644 --- a/patches/server/0088-Reduce-array-allocations.patch +++ b/patches/server/0088-Reduce-array-allocations.patch @@ -257,7 +257,7 @@ index 678410cd734cd7e3e3b999b7908f2e3f25f23a13..1240121d732a9697ec6bffcc459a00c7 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 6fb9627e5eb5873b4bc085ee4c6bc7052acad2e0..63c4a3b555575e2ebb19c6ab8459cf6617c24e27 100644 +index abb5d1a780e9c3a16700dba91aca73cba0e94b68..36411cc6c1d375cc7584daa8aa6ebb8caba7ad8a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -242,6 +242,7 @@ import org.bukkit.inventory.EquipmentSlot; @@ -268,24 +268,15 @@ index 6fb9627e5eb5873b4bc085ee4c6bc7052acad2e0..63c4a3b555575e2ebb19c6ab8459cf66 public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl implements ServerGamePacketListener, ServerPlayerConnection, TickablePacketListener { -@@ -777,7 +778,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl - // PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // Paper - AsyncTabCompleteEvent; run this async - // CraftBukkit start - if (this.chatSpamTickCount.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamLimit && !this.server.getPlayerList().isOp(this.player.getGameProfile())) { // Paper - configurable tab spam limits -- server.scheduleOnMain(() -> this.disconnect(Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM)); // Paper - AsyncTabCompleteEvent & kick event cause -+ server.scheduleOnMain(() -> this.disconnect(Component.translatable("disconnect.spam", ArrayConstants.emptyObjectArray), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM)); // Paper - kick event cause // Leaves - reduce array allocations - return; - } - // CraftBukkit end @@ -789,7 +790,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl - // Paper start - rewrite chunk system - int index; + // Paper start + final int index; if (packet.getCommand().length() > 64 && ((index = packet.getCommand().indexOf(' ')) == -1 || index >= 64)) { -- server.scheduleOnMain(() -> this.disconnect(Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM)); -+ server.scheduleOnMain(() -> this.disconnect(Component.translatable("disconnect.spam", ArrayConstants.emptyObjectArray), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM)); // Leaves - reduce array allocations +- this.disconnect(Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM); ++ this.disconnect(Component.translatable("disconnect.spam", ArrayConstants.emptyObjectArray), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM); // Leaves - reduce array allocations return; } - // Paper end - rewrite chunk system + // Paper end diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java index c5fa9f4d28f9a7f64a50a902ee5e631bfc00119c..4f93d69b51f91e25f1ee00300b553311ce9c2f7d 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -393,10 +384,10 @@ index ae32dfaa06295ae2bd046fa6303439810dec0ed8..1798cf02f4805fc69da5eab7041b517b 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 33903f1c9a2c3327404fcdbfaeb2987fafe2d84b..fb448966f644cf069dfc38f0f51262568841c51e 100644 +index 3c013188cbd667ae23e971869150eab7234d9090..938b7941f152f2b0970bfe8938af9e3db8abc70d 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -1082,7 +1082,7 @@ public abstract class Mob extends LivingEntity implements Targeting { +@@ -1088,7 +1088,7 @@ public abstract class Mob extends LivingEntity implements Targeting { @Override protected void dropCustomDeathLoot(DamageSource source, int lootingMultiplier, boolean allowDrops) { super.dropCustomDeathLoot(source, lootingMultiplier, allowDrops); @@ -405,7 +396,7 @@ index 33903f1c9a2c3327404fcdbfaeb2987fafe2d84b..fb448966f644cf069dfc38f0f5126256 int j = aenumitemslot.length; for (int k = 0; k < j; ++k) { -@@ -1144,7 +1144,7 @@ public abstract class Mob extends LivingEntity implements Targeting { +@@ -1151,7 +1151,7 @@ public abstract class Mob extends LivingEntity implements Targeting { } boolean flag = true; @@ -414,7 +405,7 @@ index 33903f1c9a2c3327404fcdbfaeb2987fafe2d84b..fb448966f644cf069dfc38f0f5126256 int j = aenumitemslot.length; for (int k = 0; k < j; ++k) { -@@ -1231,7 +1231,7 @@ public abstract class Mob extends LivingEntity implements Targeting { +@@ -1238,7 +1238,7 @@ public abstract class Mob extends LivingEntity implements Targeting { float f = localDifficulty.getSpecialMultiplier(); this.enchantSpawnedWeapon(random, f); @@ -423,7 +414,7 @@ index 33903f1c9a2c3327404fcdbfaeb2987fafe2d84b..fb448966f644cf069dfc38f0f5126256 int i = aenumitemslot.length; for (int j = 0; j < i; ++j) { -@@ -1450,7 +1450,7 @@ public abstract class Mob extends LivingEntity implements Targeting { +@@ -1457,7 +1457,7 @@ public abstract class Mob extends LivingEntity implements Targeting { t0.setInvulnerable(this.isInvulnerable()); if (flag) { t0.setCanPickUpLoot(this.canPickUpLoot()); diff --git a/patches/server/0089-Optimize-sun-burn-tick.patch b/patches/server/0089-Optimize-sun-burn-tick.patch index 81758cbb..e24bbdf2 100644 --- a/patches/server/0089-Optimize-sun-burn-tick.patch +++ b/patches/server/0089-Optimize-sun-burn-tick.patch @@ -34,10 +34,10 @@ index f7aa3c7b38847d0d1be4417d99ed2edc3e4c0e6d..42aa275f86101cb697f2525542be5d16 public void absMoveTo(double x, double y, double z, float yaw, float pitch) { this.absMoveTo(x, y, z); diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index fb448966f644cf069dfc38f0f51262568841c51e..81d7ce2a8ce07f72c95168efeb2d59dd9f4bd6c8 100644 +index 938b7941f152f2b0970bfe8938af9e3db8abc70d..a298ede6033d13986acbe88614a0ec1ba42a3958 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -1716,15 +1716,41 @@ public abstract class Mob extends LivingEntity implements Targeting { +@@ -1723,15 +1723,41 @@ public abstract class Mob extends LivingEntity implements Targeting { } diff --git a/patches/server/0106-Replay-Mod-API.patch b/patches/server/0106-Replay-Mod-API.patch index 72fa3f21..1bc5d6a8 100644 --- a/patches/server/0106-Replay-Mod-API.patch +++ b/patches/server/0106-Replay-Mod-API.patch @@ -133,7 +133,7 @@ index 2e2a7c2cf3081187da817479a9da3eb10f662a6d..ee616fe98c98a345872c1eadf41c7852 }).map((player) -> { return player.getGameProfile().getName(); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 63c4a3b555575e2ebb19c6ab8459cf6617c24e27..7dd5ebe30b94d3bc7d49b0e328d3d9a693f23463 100644 +index 36411cc6c1d375cc7584daa8aa6ebb8caba7ad8a..2030ae4806070b2ea1dc50a0f5286d1e0010dcd1 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -299,7 +299,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -369,7 +369,7 @@ index 3bec06ed4b47af1b40ba4fef264ef7b3d643fbf1..fdb4f4f8079ed680fc8deb068a5e2f0c } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 1c79abf5952c29301bc9d83cd20a81696085fbf0..9fb10025823a2452c925135d9d139fb91605589c 100644 +index f935e286103618401726481b512794430bc26c8a..fc7f5ecebcc15834d7d1348f8882fd2f0c48a4a0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -260,6 +260,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException; @@ -397,7 +397,7 @@ index 1c79abf5952c29301bc9d83cd20a81696085fbf0..9fb10025823a2452c925135d9d139fb9 @Override public CraftPlayer apply(ServerPlayer player) { return player.getBukkitEntity(); -@@ -3247,4 +3249,11 @@ public final class CraftServer implements Server { +@@ -3252,4 +3254,11 @@ public final class CraftServer implements Server { return botManager; } // Leaves end - Bot API diff --git a/patches/server/0118-Disable-offline-warn-if-use-proxy.patch b/patches/server/0118-Disable-offline-warn-if-use-proxy.patch index 85e50252..5d108a81 100644 --- a/patches/server/0118-Disable-offline-warn-if-use-proxy.patch +++ b/patches/server/0118-Disable-offline-warn-if-use-proxy.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable offline warn if use proxy diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 693bbcd26ee7b286f045ed08cfa6ec0c5ae2c938..a7b1e50d8d27a0a95bb9c6b7a40e1f83e5ec15c0 100644 +index 9b4ca17240279ca8c64a8c39bf0915a9df0427df..acfb5fa89021f9605bfc271008341c86590b0fe5 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -283,7 +283,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -284,7 +284,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord"; String proxyLink = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "https://docs.papermc.io/velocity/security" : "http://www.spigotmc.org/wiki/firewall-guide/"; // Paper end - Add Velocity IP Forwarding Support diff --git a/patches/server/0119-Disable-moved-wrongly-threshold.patch b/patches/server/0119-Disable-moved-wrongly-threshold.patch index 51da3ace..cfade8a9 100644 --- a/patches/server/0119-Disable-moved-wrongly-threshold.patch +++ b/patches/server/0119-Disable-moved-wrongly-threshold.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Disable moved wrongly threshold diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7dd5ebe30b94d3bc7d49b0e328d3d9a693f23463..1dc0010cb700f7302e8b3764f9f2851706086a2d 100644 +index 2030ae4806070b2ea1dc50a0f5286d1e0010dcd1..c05545d84d0bbd98afcc020edc5f12101e454479 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -555,7 +555,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -26,7 +26,7 @@ index 7dd5ebe30b94d3bc7d49b0e328d3d9a693f23463..1dc0010cb700f7302e8b3764f9f28517 flag2 = true; // Paper - diff on change, this should be moved wrongly ServerGamePacketListenerImpl.LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", new Object[]{entity.getName().getString(), this.player.getName().getString(), Math.sqrt(d10)}); } -@@ -1422,7 +1422,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1441,7 +1441,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_TOO_QUICKLY, toX, toY, toZ, toYaw, toPitch, true); if (!event.isAllowed()) { @@ -35,7 +35,7 @@ index 7dd5ebe30b94d3bc7d49b0e328d3d9a693f23463..1dc0010cb700f7302e8b3764f9f28517 ServerGamePacketListenerImpl.LOGGER.warn("{} moved too quickly! {},{},{}", new Object[]{this.player.getName().getString(), d6, d7, d8}); this.teleport(this.player.getX(), this.player.getY(), this.player.getZ(), this.player.getYRot(), this.player.getXRot()); return; -@@ -1492,7 +1492,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1511,7 +1511,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl d10 = d6 * d6 + d7 * d7 + d8 * d8; boolean movedWrongly = false; // Paper - Add fail move event; rename