From 927e09a89ae333096559e0cd2f20d57c01d3cf0d Mon Sep 17 00:00:00 2001 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> Date: Fri, 11 Oct 2024 19:12:21 +0300 Subject: [PATCH] fix patches --- patches/api/0001-Divine-Branding.patch | 8 ++--- patches/api/0005-Delete-Timings.patch | 6 ++-- patches/api/0006-DivineMC-API-Publish.patch | 4 +-- patches/api/0007-Bump-Dependencies.patch | 11 +++---- ...-Optimize-default-values-for-configs.patch | 30 +++++++++---------- ...04-Add-missing-purpur-config-options.patch | 16 +++++----- patches/server/0010-Fix-MC-2025.patch | 6 ++-- ...skip-entity-move-if-movement-is-zero.patch | 6 ++-- patches/server/0028-Delete-Timings.patch | 16 +++++----- patches/server/0049-No-chat-sign.patch | 6 ++-- .../0050-Remove-vanilla-username-check.patch | 4 +-- 11 files changed, 58 insertions(+), 55 deletions(-) diff --git a/patches/api/0001-Divine-Branding.patch b/patches/api/0001-Divine-Branding.patch index 9f909ca..05171f0 100644 --- a/patches/api/0001-Divine-Branding.patch +++ b/patches/api/0001-Divine-Branding.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Divine Branding diff --git a/build.gradle.kts b/build.gradle.kts -index b7d584c8b96eb7699e5df90ed04bf22ee256d571..8b1de4e68aa844856af757f6dd0e2c44b8b2db30 100644 +index f68a447f309bc9d45c275bbfee1c237f6fb0d680..5c0bf1662176a1293444dcaa0b8c7ad274a65a66 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -231,3 +231,12 @@ tasks.check { +@@ -233,3 +233,12 @@ tasks.check { dependsOn(scanJarForOldGeneratedCode) } // Paper end @@ -22,10 +22,10 @@ index b7d584c8b96eb7699e5df90ed04bf22ee256d571..8b1de4e68aa844856af757f6dd0e2c44 +} +// DivineMC end diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java -index 8c2c5ea14a839c8767bbf120ae5512f65475cbb0..4d71d7fb74b424e267cf547a4f89d6229ff9e680 100644 +index 7196594e07af19a14c320d77df893978525fe386..6811f38a2eaf614c8237190800a48d101c39cd99 100644 --- a/src/main/java/io/papermc/paper/ServerBuildInfo.java +++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java -@@ -32,6 +32,13 @@ public interface ServerBuildInfo { +@@ -33,6 +33,13 @@ public interface ServerBuildInfo { Key BRAND_PURPUR_ID = Key.key("purpurmc", "purpur"); // Purpur end diff --git a/patches/api/0005-Delete-Timings.patch b/patches/api/0005-Delete-Timings.patch index 087e243..0a0829d 100644 --- a/patches/api/0005-Delete-Timings.patch +++ b/patches/api/0005-Delete-Timings.patch @@ -1624,10 +1624,10 @@ index 3d663104c8e3089abdb9dc4d7309f873ac182e98..00000000000000000000000000000000 - diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java deleted file mode 100644 -index b831a23999c94cb1bdf7f5d2cd719d0b846242ad..0000000000000000000000000000000000000000 +index 9e165525c4c4c07c783ae2899e07c37ae49ec2de..0000000000000000000000000000000000000000 --- a/src/main/java/co/aikar/timings/TimingsCommand.java +++ /dev/null -@@ -1,130 +0,0 @@ +@@ -1,132 +0,0 @@ -/* - * This file is licensed under the MIT License (MIT). - * @@ -1686,12 +1686,14 @@ index b831a23999c94cb1bdf7f5d2cd719d0b846242ad..00000000000000000000000000000000 - if (!testPermission(sender)) { - return true; - } +- // Purpur start - if (true) { - net.kyori.adventure.text.minimessage.MiniMessage mm = net.kyori.adventure.text.minimessage.MiniMessage.miniMessage(); - sender.sendMessage(mm.deserialize("Purpur has removed timings to save your performance. Please use /spark instead")); - sender.sendMessage(mm.deserialize("For more information, view its documentation at")); - sender.sendMessage(mm.deserialize("https://spark.lucko.me/docs/Command-Usage")); - return true; +- // Purpur end - } - if (args.length < 1) { - sender.sendMessage(text("Usage: " + this.usageMessage, NamedTextColor.RED)); diff --git a/patches/api/0006-DivineMC-API-Publish.patch b/patches/api/0006-DivineMC-API-Publish.patch index d15426d..9c68843 100644 --- a/patches/api/0006-DivineMC-API-Publish.patch +++ b/patches/api/0006-DivineMC-API-Publish.patch @@ -5,10 +5,10 @@ Subject: [PATCH] DivineMC API Publish diff --git a/build.gradle.kts b/build.gradle.kts -index 8b1de4e68aa844856af757f6dd0e2c44b8b2db30..4f7615ee07531867bda77cb3e871fbe1d4aa78a1 100644 +index 5c0bf1662176a1293444dcaa0b8c7ad274a65a66..b72c89b3fea64d229a072f1fddffc7a71800d228 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -240,3 +240,14 @@ tasks.withType { +@@ -242,3 +242,14 @@ tasks.withType { compilerArgs.add("-Xlint:-dep-ann") } // DivineMC end diff --git a/patches/api/0007-Bump-Dependencies.patch b/patches/api/0007-Bump-Dependencies.patch index 0cfcc78..3896551 100644 --- a/patches/api/0007-Bump-Dependencies.patch +++ b/patches/api/0007-Bump-Dependencies.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies diff --git a/build.gradle.kts b/build.gradle.kts -index 4f7615ee07531867bda77cb3e871fbe1d4aa78a1..5f7ec80627408cb93d88fee61a851aba000d66d4 100644 +index b72c89b3fea64d229a072f1fddffc7a71800d228..26577e6602f9eed52ee30d785f6994be6f1cf77a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,8 +12,8 @@ java { @@ -48,7 +48,7 @@ index 4f7615ee07531867bda77cb3e871fbe1d4aa78a1..5f7ec80627408cb93d88fee61a851aba apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion")) apiAndDocs("net.kyori:adventure-api") apiAndDocs("net.kyori:adventure-text-minimessage") -@@ -58,24 +64,24 @@ dependencies { +@@ -58,25 +64,25 @@ dependencies { implementation("org.ow2.asm:asm-commons:9.7") // Paper end @@ -69,6 +69,7 @@ index 4f7615ee07531867bda77cb3e871fbe1d4aa78a1..5f7ec80627408cb93d88fee61a851aba compileOnlyApi(checkerQual) testCompileOnly(checkerQual) // Paper end + api("org.jspecify:jspecify:1.0.0") // Paper - add jspecify - testImplementation("org.apache.commons:commons-lang3:3.12.0") - testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") @@ -80,7 +81,7 @@ index 4f7615ee07531867bda77cb3e871fbe1d4aa78a1..5f7ec80627408cb93d88fee61a851aba testImplementation("org.ow2.asm:asm-tree:9.7") } -@@ -157,12 +163,12 @@ tasks.withType { +@@ -158,12 +164,12 @@ tasks.withType { options.use() options.isDocFilesSubDirs = true options.links( @@ -93,9 +94,9 @@ index 4f7615ee07531867bda77cb3e871fbe1d4aa78a1..5f7ec80627408cb93d88fee61a851aba - "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html", + "https://javadoc.io/doc/org.joml/joml/latest/index.html", // DivineMC - Bump Dependencies "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1", + "https://jspecify.dev/docs/api/", // Paper end - // Paper start -@@ -174,9 +180,9 @@ tasks.withType { +@@ -176,9 +182,9 @@ tasks.withType { "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/", "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/", "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/", diff --git a/patches/server/0003-Optimize-default-values-for-configs.patch b/patches/server/0003-Optimize-default-values-for-configs.patch index d1568ec..81d5d8d 100644 --- a/patches/server/0003-Optimize-default-values-for-configs.patch +++ b/patches/server/0003-Optimize-default-values-for-configs.patch @@ -21,10 +21,10 @@ index a9dd0e5216e95afd98fd2200d110e2cc0b1b0dca..06b75003e88363aa3902cfef97b3bd3e public boolean strictAdvancementDimensionCheck = false; public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT; diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -index 790e3167cfa2511ef2fc707d9b9aa681a78d8ba0..98f9607dc0020df4e3739147252678617cb987f2 100644 +index c867796f625813797f167610ad443c4be5a7561e..b49f019cd700f3820e5947b9ba46beaf9a59da2e 100644 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -@@ -153,9 +153,9 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -154,9 +154,9 @@ public class WorldConfiguration extends ConfigurationPart { public ArmorStands armorStands; @@ -37,7 +37,7 @@ index 790e3167cfa2511ef2fc707d9b9aa681a78d8ba0..98f9607dc0020df4e373914725267861 } public Markers markers; -@@ -272,8 +272,8 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -273,8 +273,8 @@ public class WorldConfiguration extends ConfigurationPart { public Behavior behavior; public class Behavior extends ConfigurationPart { @@ -48,7 +48,7 @@ index 790e3167cfa2511ef2fc707d9b9aa681a78d8ba0..98f9607dc0020df4e373914725267861 public int experienceMergeMaxValue = -1; public boolean shouldRemoveDragon = false; public boolean zombiesTargetTurtleEggs = true; -@@ -297,7 +297,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -298,7 +298,7 @@ public class WorldConfiguration extends ConfigurationPart { public int playerInsomniaStartTicks = 72000; public int phantomsSpawnAttemptMinSeconds = 60; public int phantomsSpawnAttemptMaxSeconds = 119; @@ -57,7 +57,7 @@ index 790e3167cfa2511ef2fc707d9b9aa681a78d8ba0..98f9607dc0020df4e373914725267861 @BelowZeroToEmpty public DoubleOr.Default zombieVillagerInfectionChance = DoubleOr.Default.USE_DEFAULT; public MobsCanAlwaysPickUpLoot mobsCanAlwaysPickUpLoot; -@@ -308,7 +308,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -309,7 +309,7 @@ public class WorldConfiguration extends ConfigurationPart { } public boolean disablePlayerCrits = false; @@ -66,7 +66,7 @@ index 790e3167cfa2511ef2fc707d9b9aa681a78d8ba0..98f9607dc0020df4e373914725267861 @Comment("Prevents merging items that are not on the same y level, preventing potential visual artifacts.") public boolean onlyMergeItemsHorizontally = false; public PillagerPatrols pillagerPatrols; -@@ -405,7 +405,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -407,7 +407,7 @@ public class WorldConfiguration extends ConfigurationPart { public class Environment extends ConfigurationPart { public boolean disableThunder = false; public boolean disableIceAndSnow = false; @@ -75,7 +75,7 @@ index 790e3167cfa2511ef2fc707d9b9aa681a78d8ba0..98f9607dc0020df4e373914725267861 public boolean disableExplosionKnockback = false; public boolean generateFlatBedrock = false; public FrostedIce frostedIce; -@@ -451,7 +451,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -457,7 +457,7 @@ public class WorldConfiguration extends ConfigurationPart { public class Maps extends ConfigurationPart { public int itemFrameCursorLimit = 128; @@ -84,7 +84,7 @@ index 790e3167cfa2511ef2fc707d9b9aa681a78d8ba0..98f9607dc0020df4e373914725267861 } public Fixes fixes; -@@ -477,7 +477,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -483,7 +483,7 @@ public class WorldConfiguration extends ConfigurationPart { public class Hopper extends ConfigurationPart { public boolean cooldownWhenFull = true; public boolean disableMoveEvent = false; @@ -93,7 +93,7 @@ index 790e3167cfa2511ef2fc707d9b9aa681a78d8ba0..98f9607dc0020df4e373914725267861 } public Collisions collisions; -@@ -485,9 +485,9 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -491,9 +491,9 @@ public class WorldConfiguration extends ConfigurationPart { public class Collisions extends ConfigurationPart { public boolean onlyPlayersCollide = false; public boolean allowVehicleCollisions = true; @@ -105,7 +105,7 @@ index 790e3167cfa2511ef2fc707d9b9aa681a78d8ba0..98f9607dc0020df4e373914725267861 public boolean allowPlayerCrammingDamage = false; } -@@ -495,18 +495,31 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -501,18 +501,31 @@ public class WorldConfiguration extends ConfigurationPart { public class Chunks extends ConfigurationPart { public AutosavePeriod autoSaveInterval = AutosavePeriod.def(); @@ -147,7 +147,7 @@ index 790e3167cfa2511ef2fc707d9b9aa681a78d8ba0..98f9607dc0020df4e373914725267861 }); public boolean flushRegionsOnSave = false; } -@@ -521,13 +534,15 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -527,13 +540,15 @@ public class WorldConfiguration extends ConfigurationPart { public TickRates tickRates; public class TickRates extends ConfigurationPart { @@ -168,7 +168,7 @@ index 790e3167cfa2511ef2fc707d9b9aa681a78d8ba0..98f9607dc0020df4e373914725267861 } @Setting(FeatureSeedsGeneration.FEATURE_SEEDS_KEY) -@@ -536,7 +551,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -542,7 +557,7 @@ public class WorldConfiguration extends ConfigurationPart { public class FeatureSeeds extends ConfigurationPart { @SuppressWarnings("unused") // Is used in FeatureSeedsGeneration @Setting(FeatureSeedsGeneration.GENERATE_KEY) @@ -177,7 +177,7 @@ index 790e3167cfa2511ef2fc707d9b9aa681a78d8ba0..98f9607dc0020df4e373914725267861 @Setting(FeatureSeedsGeneration.FEATURES_KEY) public Reference2LongMap>> features = new Reference2LongOpenHashMap<>(); -@@ -557,9 +572,9 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -563,9 +578,9 @@ public class WorldConfiguration extends ConfigurationPart { public class Misc extends ConfigurationPart { public int lightQueueSize = 20; @@ -190,7 +190,7 @@ index 790e3167cfa2511ef2fc707d9b9aa681a78d8ba0..98f9607dc0020df4e373914725267861 public boolean disableEndCredits = false; public DoubleOr.Default maxLeashDistance = DoubleOr.Default.USE_DEFAULT; diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 35ee62f6298b4d3bc2e294c263e7ffc862a176fa..c3b39063f4cca69ecf71708e2ad5d92bbafa5ea8 100644 +index 3f02b6540cd0d318fbeb9708a751047dd7f3305b..37b77f5c1205d5ffdbb78564bba79373c0ae5885 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -346,7 +346,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -203,7 +203,7 @@ index 35ee62f6298b4d3bc2e294c263e7ffc862a176fa..c3b39063f4cca69ecf71708e2ad5d92b DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware."); // Spigot start diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 54abd6874a64c669fc22448849febc9ef7c0f95e..59cf59bd127fd1fe1c8dbac2086ddbafcb296e4e 100644 +index 546d920198acc2a7aea6e251a34d92d33cbaaee7..713bb7a718c8663ff1d05f71ef22bf3046245b55 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -243,7 +243,7 @@ public class PurpurConfig { diff --git a/patches/server/0004-Add-missing-purpur-config-options.patch b/patches/server/0004-Add-missing-purpur-config-options.patch index 6744533..dc0a0ff 100644 --- a/patches/server/0004-Add-missing-purpur-config-options.patch +++ b/patches/server/0004-Add-missing-purpur-config-options.patch @@ -190,7 +190,7 @@ index c14019a131c90c699b8a76bada82592b66f0fa89..6f3fede6a51c6854dd93fe1462097ab3 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 59cf59bd127fd1fe1c8dbac2086ddbafcb296e4e..96e5a9120f41587a213c607b7f27e29fcfe247a8 100644 +index 713bb7a718c8663ff1d05f71ef22bf3046245b55..48895d1edcfa56b1fd61ef19c95028fcc67e8303 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -330,6 +330,7 @@ public class PurpurConfig { @@ -210,10 +210,10 @@ index 59cf59bd127fd1fe1c8dbac2086ddbafcb296e4e..96e5a9120f41587a213c607b7f27e29f org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27); enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b291c770e1a5a7b56e592c62a2ac17dbad3268e9..d50193f7b5a7931e9e4106a3c3dda75101967e31 100644 +index 3bcbf5e2dbb991a8416d827ddfe59e04f701ebf7..7f2c89928031301fcd50a70a2ef18fcb005784bc 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -1173,12 +1173,20 @@ public class PurpurWorldConfig { +@@ -1135,12 +1135,20 @@ public class PurpurWorldConfig { public boolean allayControllable = true; public double allayMaxHealth = 20.0D; public double allayScale = 1.0D; @@ -234,7 +234,7 @@ index b291c770e1a5a7b56e592c62a2ac17dbad3268e9..d50193f7b5a7931e9e4106a3c3dda751 } public boolean armadilloRidable = false; -@@ -1328,7 +1336,15 @@ public class PurpurWorldConfig { +@@ -1290,7 +1298,15 @@ public class PurpurWorldConfig { public double camelMovementSpeedMin = 0.09D; public double camelMovementSpeedMax = 0.09D; public int camelBreedingTicks = 6000; @@ -250,7 +250,7 @@ index b291c770e1a5a7b56e592c62a2ac17dbad3268e9..d50193f7b5a7931e9e4106a3c3dda751 camelRidableInWater = getBoolean("mobs.camel.ridable-in-water", camelRidableInWater); camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin); camelMaxHealthMax = getDouble("mobs.camel.attributes.max_health.max", camelMaxHealthMax); -@@ -1782,7 +1798,17 @@ public class PurpurWorldConfig { +@@ -1744,7 +1760,17 @@ public class PurpurWorldConfig { public boolean frogControllable = true; public float frogRidableJumpHeight = 0.65F; public int frogBreedingTicks = 6000; @@ -268,7 +268,7 @@ index b291c770e1a5a7b56e592c62a2ac17dbad3268e9..d50193f7b5a7931e9e4106a3c3dda751 frogRidable = getBoolean("mobs.frog.ridable", frogRidable); frogRidableInWater = getBoolean("mobs.frog.ridable-in-water", frogRidableInWater); frogControllable = getBoolean("mobs.frog.controllable", frogControllable); -@@ -2794,7 +2820,15 @@ public class PurpurWorldConfig { +@@ -2756,7 +2782,15 @@ public class PurpurWorldConfig { public double snifferMaxHealth = 14.0D; public double snifferScale = 1.0D; public int snifferBreedingTicks = 6000; @@ -284,7 +284,7 @@ index b291c770e1a5a7b56e592c62a2ac17dbad3268e9..d50193f7b5a7931e9e4106a3c3dda751 snifferRidable = getBoolean("mobs.sniffer.ridable", snifferRidable); snifferRidableInWater = getBoolean("mobs.sniffer.ridable-in-water", snifferRidableInWater); snifferControllable = getBoolean("mobs.sniffer.controllable", snifferControllable); -@@ -2902,7 +2936,17 @@ public class PurpurWorldConfig { +@@ -2864,7 +2898,17 @@ public class PurpurWorldConfig { public boolean tadpoleRidable = false; public boolean tadpoleRidableInWater = true; public boolean tadpoleControllable = true; @@ -302,7 +302,7 @@ index b291c770e1a5a7b56e592c62a2ac17dbad3268e9..d50193f7b5a7931e9e4106a3c3dda751 tadpoleRidable = getBoolean("mobs.tadpole.ridable", tadpoleRidable); tadpoleRidableInWater = getBoolean("mobs.tadpole.ridable-in-water", tadpoleRidableInWater); tadpoleControllable = getBoolean("mobs.tadpole.controllable", tadpoleControllable); -@@ -3130,7 +3174,17 @@ public class PurpurWorldConfig { +@@ -3092,7 +3136,17 @@ public class PurpurWorldConfig { public boolean wardenRidable = false; public boolean wardenRidableInWater = true; public boolean wardenControllable = true; diff --git a/patches/server/0010-Fix-MC-2025.patch b/patches/server/0010-Fix-MC-2025.patch index 104d7b2..e5e618c 100644 --- a/patches/server/0010-Fix-MC-2025.patch +++ b/patches/server/0010-Fix-MC-2025.patch @@ -7,10 +7,10 @@ Original post on Mojira: https://bugs.mojang.com/browse/MC-2025 Fix taken from Reddit: https://redd.it/8pgd4q diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e3e71558d9d99fa878511f051d1d8592f8684ac0..ec22afe908a303e3b0a27b387e59d11efe2eebf3 100644 +index 7aadcaa1785c6560eb1ce2f1179225facca47d84..bdfeabbfd180c08dd58f807c63adc82e4720e172 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2594,6 +2594,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2596,6 +2596,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess nbttagcompound.putBoolean("Purpur.FireImmune", immuneToFire); } // Purpur end @@ -28,7 +28,7 @@ index e3e71558d9d99fa878511f051d1d8592f8684ac0..ec22afe908a303e3b0a27b387e59d11e return nbttagcompound; } catch (Throwable throwable) { CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT"); -@@ -2671,6 +2682,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2673,6 +2684,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess this.reapplyPosition(); } diff --git a/patches/server/0015-vmp-skip-entity-move-if-movement-is-zero.patch b/patches/server/0015-vmp-skip-entity-move-if-movement-is-zero.patch index d8ad81d..2606332 100644 --- a/patches/server/0015-vmp-skip-entity-move-if-movement-is-zero.patch +++ b/patches/server/0015-vmp-skip-entity-move-if-movement-is-zero.patch @@ -7,7 +7,7 @@ Original code by RelativityMC, licensed under MIT You can find the original code on https://github.com/RelativityMC/VMP-fabric (Yarn mappings) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index bf1d86088c7e77d15977ba81ed88697e45603345..e9e68d3d7ef7e1e2c9c633e3cbf37c9dfc9b45d9 100644 +index bdfeabbfd180c08dd58f807c63adc82e4720e172..5bebee98005225559fb6e6f60bb6115c8ffa0e89 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -323,6 +323,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -18,7 +18,7 @@ index bf1d86088c7e77d15977ba81ed88697e45603345..e9e68d3d7ef7e1e2c9c633e3cbf37c9d public boolean onGround; public boolean horizontalCollision; public boolean verticalCollision; -@@ -1145,6 +1146,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1147,6 +1148,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess // Paper end - detailed watchdog information public void move(MoverType movementType, Vec3 movement) { @@ -31,7 +31,7 @@ index bf1d86088c7e77d15977ba81ed88697e45603345..e9e68d3d7ef7e1e2c9c633e3cbf37c9d final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity // Paper start - detailed watchdog information ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main"); -@@ -4217,6 +4224,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4219,6 +4226,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } public final void setBoundingBox(AABB boundingBox) { diff --git a/patches/server/0028-Delete-Timings.patch b/patches/server/0028-Delete-Timings.patch index 4055432..ea08fa6 100644 --- a/patches/server/0028-Delete-Timings.patch +++ b/patches/server/0028-Delete-Timings.patch @@ -827,7 +827,7 @@ index 01efbc507b3d58f13f78ee286f93df40cdc3f0cb..1f7f68aad97ee73763c042837f239bdc } catch (Exception exception) { if (exception instanceof ReportedException) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4bcb20cd6cd971f25327ec1322bb172f036a54a4..704f8509ca70d8e1961c87090858a8a3cab4c886 100644 +index d78cb68c3a53b277aa26186062efc716c8f80f36..8658296b919fd6fa28e64a64186060d3704271db 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -3,7 +3,6 @@ package net.minecraft.server; @@ -855,7 +855,7 @@ index 4bcb20cd6cd971f25327ec1322bb172f036a54a4..704f8509ca70d8e1961c87090858a8a3 this.server.spark.disable(); // Paper - spark // Purpur start if (upnp) { -@@ -1615,15 +1611,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop public diff --git a/patches/server/0050-Remove-vanilla-username-check.patch b/patches/server/0050-Remove-vanilla-username-check.patch index 6e952de..e8dd074 100644 --- a/patches/server/0050-Remove-vanilla-username-check.patch +++ b/patches/server/0050-Remove-vanilla-username-check.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove vanilla username check diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java -index 23181027bb077417655913c29377bed720c9e9c1..429a1b2cd3d479894f91c6b64b5a7f6ee8d59950 100644 +index 8849862b45ccbbc635a1c316e9870bca81e55c04..85b7c7742a2cc678aec317487fc811b9680e87d6 100644 --- a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java -@@ -293,7 +293,7 @@ public class CraftPlayerProfile implements PlayerProfile, SharedPlayerProfile { +@@ -295,7 +295,7 @@ public class CraftPlayerProfile implements PlayerProfile, SharedPlayerProfile { private static GameProfile createAuthLibProfile(UUID uniqueId, String name) { Preconditions.checkArgument(name == null || name.length() <= 16, "Name cannot be longer than 16 characters");