From 6b54d11f9c3fc4178f2f1cad522229efc71972b1 Mon Sep 17 00:00:00 2001 From: AlphaKR93 Date: Fri, 25 Oct 2024 07:22:54 +0900 Subject: [PATCH] more work --- initDev | 7 ++- ....patch => 0003-Build-System-Changes.patch} | 2 +- .../0008-Port-SparklyPaper-patches.patch | 28 +++++----- ...lways-agree-EULA-on-development-mode.patch | 4 +- ...-apply-the-configuration-to-the-vani.patch | 14 ++--- .../server/0013-Tweak-console-logging.patch | 6 +-- ...option-to-change-nether-portal-size.patch} | 10 ++-- .../0016-Reduce-create-random-instance.patch} | 52 +++++++++---------- .../0017-Apply-various-optimizations.patch} | 6 +-- ...Do-not-load-chunks-to-spawn-phantom.patch} | 0 ...able-moved-to-quickly-check-for-spe.patch} | 4 +- 11 files changed, 68 insertions(+), 65 deletions(-) rename patches/server/{0003-Use-Gradle-Version-Catalogs.patch => 0003-Build-System-Changes.patch} (98%) rename patches/{unapplied/server/working/0016-Add-option-to-change-nether-portal-size.patch => server/0015-Add-option-to-change-nether-portal-size.patch} (92%) rename patches/{unapplied/server/working/0017-Reduce-create-random-instance.patch => server/0016-Reduce-create-random-instance.patch} (91%) rename patches/{unapplied/server/working/0018-Apply-various-optimizations.patch => server/0017-Apply-various-optimizations.patch} (87%) rename patches/{unapplied/server/working/0019-Do-not-load-chunks-to-spawn-phantom.patch => server/0018-Do-not-load-chunks-to-spawn-phantom.patch} (100%) rename patches/{unapplied/server/working/0020-Add-option-to-disable-moved-to-quickly-check-for-spe.patch => server/0019-Add-option-to-disable-moved-to-quickly-check-for-spe.patch} (92%) diff --git a/initDev b/initDev index 8d2822e..6362c86 100755 --- a/initDev +++ b/initDev @@ -26,9 +26,10 @@ alias rcc="git rebase --continue" # generate Fixup patches for Server function fs() { cd ./*-Server || exit 1 + [ "$1" == "-a" ] && "$garg" = "--amend" git add . - git commit -m "fixup" + git commit "$garg" -m "fixup" git format-patch -1 mv 0001-fixup.patch ../ @@ -38,9 +39,10 @@ function fs() { # generate Fixup patches for API function fa() { cd ./*-API || exit 1 + [ "$1" == "-a" ] && "$garg" = "--amend" git add . - git commit -m "fixup" + git commit "$garg" -m "fixup" git format-patch -1 mv 0001-fixup.patch ../ @@ -58,3 +60,4 @@ function cuu() { # shellcheck disable=SC2059 printf "Updated Upstream ($1)$(/bin/cat compare.txt)" | git commit -F - } + diff --git a/patches/server/0003-Use-Gradle-Version-Catalogs.patch b/patches/server/0003-Build-System-Changes.patch similarity index 98% rename from patches/server/0003-Use-Gradle-Version-Catalogs.patch rename to patches/server/0003-Build-System-Changes.patch index cd4950c..fe5f1e4 100644 --- a/patches/server/0003-Use-Gradle-Version-Catalogs.patch +++ b/patches/server/0003-Build-System-Changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build System Changes diff --git a/build.gradle.kts b/build.gradle.kts -index 535b0c6a7..3bb91f4d0 100644 +index 535b0c6a750cc77fb9340d6e080932f3eb3bde17..3bb91f4d0447fc283c56ffab24cb8e203925ebad 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,70 +13,29 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { diff --git a/patches/server/0008-Port-SparklyPaper-patches.patch b/patches/server/0008-Port-SparklyPaper-patches.patch index 930476b..00c8f08 100644 --- a/patches/server/0008-Port-SparklyPaper-patches.patch +++ b/patches/server/0008-Port-SparklyPaper-patches.patch @@ -61,7 +61,7 @@ index 8b5293b0c696ef21d0101493ffa41b60bf0bc86b..03be23690a94a14d7343526acad67ccf } diff --git a/src/main/java/io/papermc/paper/threadedregions/EntityScheduler.java b/src/main/java/io/papermc/paper/threadedregions/EntityScheduler.java -index c03608fec..931800662 100644 +index c03608fec96b51e1867f43d8f42e5aefb1520e46..93180066224345c0332fb33744f84204f15bba29 100644 --- a/src/main/java/io/papermc/paper/threadedregions/EntityScheduler.java +++ b/src/main/java/io/papermc/paper/threadedregions/EntityScheduler.java @@ -41,6 +41,7 @@ public final class EntityScheduler { @@ -112,7 +112,7 @@ index c03608fec..931800662 100644 throw new IllegalStateException("Ticking retired scheduler"); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ccfeda1ba..c63910d92 100644 +index ccfeda1ba3f89112eccf29f382b5526934db1d91..c63910d9215875e91968c509932b9f5393bb6457 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -327,6 +327,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop blockChanges) { if (this.getHandle().connection == null) return; @@ -811,7 +811,7 @@ index 241340a6d66f17f2a31fb03ff0dfab121b856368..a6cf73d104e66971a61ac979d4a6d58a for (Map.Entry entry : blockChanges.entrySet()) { BlockData blockData = entry.getValue(); -@@ -2237,9 +2237,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2259,9 +2259,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public boolean canSee(org.bukkit.entity.Entity entity) { diff --git a/patches/server/0009-Always-agree-EULA-on-development-mode.patch b/patches/server/0009-Always-agree-EULA-on-development-mode.patch index c83b4d3..f8a2e1b 100644 --- a/patches/server/0009-Always-agree-EULA-on-development-mode.patch +++ b/patches/server/0009-Always-agree-EULA-on-development-mode.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Always agree EULA on development mode diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index 4911a6d25d12eb9d2b263aeb9b7f521ff828397a..29eef278940cab33a1f5f168f66ab2b80f0d60ce 100644 +index ac2f6591dc6130f1877703c804a1359f3262f803..639a0624f5e746b9a876d62c3215c7856931deea 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java -@@ -166,6 +166,7 @@ public class Main { +@@ -167,6 +167,7 @@ public class Main { // Spigot Start boolean eulaAgreed = Boolean.getBoolean( "com.mojang.eula.agree" ); diff --git a/patches/server/0012-Add-an-option-to-apply-the-configuration-to-the-vani.patch b/patches/server/0012-Add-an-option-to-apply-the-configuration-to-the-vani.patch index 9e197fc..8b973b9 100644 --- a/patches/server/0012-Add-an-option-to-apply-the-configuration-to-the-vani.patch +++ b/patches/server/0012-Add-an-option-to-apply-the-configuration-to-the-vani.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add an option to apply the configuration to the vanilla diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -index 8445a0b25d647b2c1f9a44f849084cdec0842e18..86822868e47b269891a71fdc04371b1e28a2752e 100644 +index d417b773dec5f2c4a8e115864338612d8e4b9f6c..f89ae1a542120eb01c028a1a1f0771ac211bcd49 100644 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java @@ -89,7 +89,7 @@ public class GlobalConfiguration extends ConfigurationPart { @@ -19,10 +19,10 @@ index 8445a0b25d647b2c1f9a44f849084cdec0842e18..86822868e47b269891a71fdc04371b1e } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 8de087636686b78c12bc1c293258713ff7dddff0..60da66fea37f8b9f68a543ff6cdb844a32d654ad 100644 +index 52d9b6253e05cae57d44f340b33316eff113db2e..47cbac24d704a047f56a98c9eb0f8a8b2001ae48 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -428,7 +428,19 @@ public final class CraftServer implements Server { +@@ -434,7 +434,19 @@ public final class CraftServer implements Server { this.configuration = YamlConfiguration.loadConfiguration(this.getConfigFile()); this.configuration.options().copyDefaults(true); @@ -56,10 +56,10 @@ index 40a6ef72b4d495140c486c0880fdc5fc1a32931c..3e0e67c089e269d0bccd4a0d2de5ac1a } diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 6c2a3813e7d63d57f07a8fa2edbb9d231221d818..15f05cd16a9867da95dd1fcdaeeb134553f651d1 100644 +index 4dbb109d0526afee99b9190fc256585121aac9b5..3835a7aa3e3c60a6f50f1d6e781f280ea8a83fb3 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -197,8 +197,8 @@ public class SpigotConfig +@@ -193,8 +193,8 @@ public class SpigotConfig public static String whitelistMessage; public static String unknownCommandMessage; public static String serverFullMessage; @@ -70,7 +70,7 @@ index 6c2a3813e7d63d57f07a8fa2edbb9d231221d818..15f05cd16a9867da95dd1fcdaeeb1345 private static String transform(String s) { return ChatColor.translateAlternateColorCodes( '&', s ).replaceAll( "\\\\n", "\n" ); -@@ -211,9 +211,9 @@ public class SpigotConfig +@@ -207,9 +207,9 @@ public class SpigotConfig SpigotConfig.set( "messages.outdated-server", SpigotConfig.outdatedServerMessage ); } @@ -83,7 +83,7 @@ index 6c2a3813e7d63d57f07a8fa2edbb9d231221d818..15f05cd16a9867da95dd1fcdaeeb1345 SpigotConfig.outdatedClientMessage = SpigotConfig.transform( SpigotConfig.getString( "messages.outdated-client", SpigotConfig.outdatedClientMessage ) ); SpigotConfig.outdatedServerMessage = SpigotConfig.transform( SpigotConfig.getString( "messages.outdated-server", SpigotConfig.outdatedServerMessage ) ); } -@@ -227,7 +227,7 @@ public class SpigotConfig +@@ -223,7 +223,7 @@ public class SpigotConfig SpigotConfig.timeoutTime = SpigotConfig.getInt( "settings.timeout-time", SpigotConfig.timeoutTime ); SpigotConfig.restartOnCrash = SpigotConfig.getBoolean( "settings.restart-on-crash", SpigotConfig.restartOnCrash ); SpigotConfig.restartScript = SpigotConfig.getString( "settings.restart-script", SpigotConfig.restartScript ); diff --git a/patches/server/0013-Tweak-console-logging.patch b/patches/server/0013-Tweak-console-logging.patch index ebe34d2..e5172d1 100644 --- a/patches/server/0013-Tweak-console-logging.patch +++ b/patches/server/0013-Tweak-console-logging.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Tweak console logging diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index f6afc085b..dea61aeaf 100644 +index f6afc085b903fe0a71109792593da21b665a5300..dea61aeaf8b444c71fb54459b09486a9853772d1 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -197,16 +197,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -59,10 +59,10 @@ index f6afc085b..dea61aeaf 100644 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index b863f6fe65c796a1d3102cc3eddb5d6c5becd3ac..c36ebab552c480d34e7fd48a45f0a320a97b9677 100644 +index 0ea07da1b4bd420cd6765577b4719a2368b5740c..f78a0a224c86c0e3e5a44ce4f589cd8a61c546f9 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -1497,6 +1497,7 @@ public abstract class PlayerList { +@@ -1462,6 +1462,7 @@ public abstract class PlayerList { } public boolean verifyChatTrusted(PlayerChatMessage message) { // Paper - private -> public diff --git a/patches/unapplied/server/working/0016-Add-option-to-change-nether-portal-size.patch b/patches/server/0015-Add-option-to-change-nether-portal-size.patch similarity index 92% rename from patches/unapplied/server/working/0016-Add-option-to-change-nether-portal-size.patch rename to patches/server/0015-Add-option-to-change-nether-portal-size.patch index 2b20924..a21f43b 100644 --- a/patches/unapplied/server/working/0016-Add-option-to-change-nether-portal-size.patch +++ b/patches/server/0015-Add-option-to-change-nether-portal-size.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add option to change nether portal size diff --git a/src/main/java/net/minecraft/world/level/portal/PortalShape.java b/src/main/java/net/minecraft/world/level/portal/PortalShape.java -index afe6b2170846273b41b694aa53dca4c31bf78b3f..52043e451ca0641c93205aac62aba5427625b81f 100644 +index 6c07fc507df6070854f5950a8616d2949c040656..19f58609aedecec1ea1a552c135a0b4199ab5c2a 100644 --- a/src/main/java/net/minecraft/world/level/portal/PortalShape.java +++ b/src/main/java/net/minecraft/world/level/portal/PortalShape.java -@@ -99,7 +99,7 @@ public class PortalShape { +@@ -97,7 +97,7 @@ public class PortalShape { private int calculateWidth() { int i = this.getDistanceUntilEdgeAboveFrame(this.bottomLeft, this.rightDir); @@ -17,7 +17,7 @@ index afe6b2170846273b41b694aa53dca4c31bf78b3f..52043e451ca0641c93205aac62aba542 } private int getDistanceUntilEdgeAboveFrame(BlockPos pos, Direction direction) { -@@ -132,7 +132,7 @@ public class PortalShape { +@@ -130,7 +130,7 @@ public class PortalShape { BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos(); int i = this.getDistanceUntilTop(blockposition_mutableblockposition); @@ -26,7 +26,7 @@ index afe6b2170846273b41b694aa53dca4c31bf78b3f..52043e451ca0641c93205aac62aba542 } private boolean hasTopFrame(BlockPos.MutableBlockPos pos, int height) { -@@ -186,7 +186,7 @@ public class PortalShape { +@@ -184,7 +184,7 @@ public class PortalShape { } public boolean isValid() { @@ -34,7 +34,7 @@ index afe6b2170846273b41b694aa53dca4c31bf78b3f..52043e451ca0641c93205aac62aba542 + return this.bottomLeft != null && this.width >= this.level.getMinecraftWorld().plazmaConfig().structure.netherPortal.width.min() && this.width <= this.level.getMinecraftWorld().plazmaConfig().structure.netherPortal.width.max() && this.height >= this.level.getMinecraftWorld().plazmaConfig().structure.netherPortal.height.min() && this.height <= this.level.getMinecraftWorld().plazmaConfig().structure.netherPortal.height.max(); // Plazma - Configurable nether portal size } - // CraftBukkit start - return boolean + // CraftBukkit start - return boolean, add entity diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java index 069a9f8504c74d939b1df569f082cc7bd33d9cfc..b5b4229ccdecd63bd3e689e8247e44341d7c30cc 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java diff --git a/patches/unapplied/server/working/0017-Reduce-create-random-instance.patch b/patches/server/0016-Reduce-create-random-instance.patch similarity index 91% rename from patches/unapplied/server/working/0017-Reduce-create-random-instance.patch rename to patches/server/0016-Reduce-create-random-instance.patch index 95dcac4..6ee30f9 100644 --- a/patches/unapplied/server/working/0017-Reduce-create-random-instance.patch +++ b/patches/server/0016-Reduce-create-random-instance.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Reduce create random instance diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 703e3720cf28c669000b663cba56b070ac4ed96a..4782f19409d300fbcaa952ae0dd6a0577ade5f7b 100644 +index c63910d9215875e91968c509932b9f5393bb6457..c921595420939847bf91dc0cbb07faf3d815b02f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -232,6 +232,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 2147483647L ? Integer.MAX_VALUE : (int) l; int j1 = this.getCoprime(i1); @@ -42,7 +42,7 @@ index 4a29e90ff2a0fe9c5be094400d79ab89e61c437d..582cdbb7e2f25cdc533721e45a89ae15 for (int l1 = 0; l1 < i1; ++l1) { int i2 = (k1 + j1 * l1) % i1; -@@ -520,7 +520,7 @@ public class ServerPlayer extends Player { +@@ -508,7 +508,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple long l = k * k; int i1 = l > 2147483647L ? Integer.MAX_VALUE : (int) l; int j1 = this.getCoprime(i1); @@ -52,10 +52,10 @@ index 4a29e90ff2a0fe9c5be094400d79ab89e61c437d..582cdbb7e2f25cdc533721e45a89ae15 for (int l1 = 0; l1 < i1; ++l1) { int i2 = (k1 + j1 * l1) % i1; diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 3b4fadb37eafb2f7b0ce4d6b276d2fdaa8287521..ba041288f9619870ab08c2956262d35eed85b44b 100644 +index 19d3423644a6a394743c09eb6935bb7633a329a2..7c24e43b795b1483d9c1ff71b8fa254f88ae06c9 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -@@ -91,7 +91,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, +@@ -98,7 +98,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, this.serverId = ""; this.server = server; this.connection = connection; @@ -130,12 +130,12 @@ index 96e9fce5f9084737d2fcf4deb83305733b480179..43da8ea227b2b01d6975a3f4f209099d private int tickDelay; private int spawnDelay; diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java -index 7dd5e0b935d98d552c916f8412569ff4aa0e9b04..4d0f209df602f017500c1d56423fa482423f9702 100644 +index 1223c5d23d0ea6aed068bdf0f5725e2ad49fc82c..0475c451fde5c8d370c1bc6fe6d27fa7bca287d1 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java +++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java -@@ -87,7 +87,7 @@ public class FishingHook extends Projectile { +@@ -88,7 +88,7 @@ public class FishingHook extends Projectile { - private FishingHook(EntityType type, Level world, int luckOfTheSeaLevel, int lureLevel) { + private FishingHook(EntityType type, Level world, int luckBonus, int waitTimeReductionTicks) { super(type, world); - this.syncronizedRandom = RandomSource.create(); + this.syncronizedRandom = world.plazmaConfig().misc.reduceRandom ? world.getRandom() : RandomSource.create(); // Plazma - Reduce create random instance @@ -143,10 +143,10 @@ index 7dd5e0b935d98d552c916f8412569ff4aa0e9b04..4d0f209df602f017500c1d56423fa482 this.currentState = FishingHook.FishHookState.FLYING; this.noCulling = true; diff --git a/src/main/java/net/minecraft/world/entity/raid/Raid.java b/src/main/java/net/minecraft/world/entity/raid/Raid.java -index fdff9788eaf663be79214b2ca491f0f0444f6136..de50b06f13df481fa59e1abe16d5181b8124b427 100644 +index dcbef04bbaab988096bf416163264833e84d1967..ea3dd26a6c357b41f33cad1b2953d356587d8759 100644 --- a/src/main/java/net/minecraft/world/entity/raid/Raid.java +++ b/src/main/java/net/minecraft/world/entity/raid/Raid.java -@@ -118,7 +118,7 @@ public class Raid { +@@ -115,7 +115,7 @@ public class Raid { public Raid(int id, ServerLevel world, BlockPos pos) { this.raidEvent = new ServerBossEvent(Raid.RAID_NAME_COMPONENT, BossEvent.BossBarColor.RED, BossEvent.BossBarOverlay.NOTCHED_10); @@ -155,7 +155,7 @@ index fdff9788eaf663be79214b2ca491f0f0444f6136..de50b06f13df481fa59e1abe16d5181b this.waveSpawnPos = Optional.empty(); this.id = id; this.level = world; -@@ -132,7 +132,7 @@ public class Raid { +@@ -129,7 +129,7 @@ public class Raid { public Raid(ServerLevel world, CompoundTag nbt) { this.raidEvent = new ServerBossEvent(Raid.RAID_NAME_COMPONENT, BossEvent.BossBarColor.RED, BossEvent.BossBarOverlay.NOTCHED_10); @@ -165,10 +165,10 @@ index fdff9788eaf663be79214b2ca491f0f0444f6136..de50b06f13df481fa59e1abe16d5181b this.level = world; this.id = nbt.getInt("Id"); diff --git a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java -index 6d28f1097caa3e37c2917eb401018ebf48c13a39..9397f1fa3b53423deabbedc6f7bb0f98d68c89a2 100644 +index e59a38d051179753fa9b29e8d746e25e162cac3e..a4b9c9d5a7af9cbe8786e9c9a071968aa5b42c2f 100644 --- a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java +++ b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java -@@ -96,7 +96,7 @@ public class EnchantmentMenu extends AbstractContainerMenu { +@@ -99,7 +99,7 @@ public class EnchantmentMenu extends AbstractContainerMenu { } // Purpur end }; @@ -178,10 +178,10 @@ index 6d28f1097caa3e37c2917eb401018ebf48c13a39..9397f1fa3b53423deabbedc6f7bb0f98 this.costs = new int[3]; this.enchantClue = new int[]{-1, -1, -1}; diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java -index 0022263a41b74fc339c5a5629aee3cd2cd05c5ae..0b553c9e90b53cdf84b14a5d5d20dc3cf1ffb44f 100644 +index 4ea1ce1cface25b9bf0e3958d55ba2fbbff69a9e..20f4d2a0996f3eb56bae5116b63b99a3a87e79b5 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java -@@ -93,7 +93,7 @@ public class Explosion { +@@ -336,7 +336,7 @@ public class Explosion { } public Explosion(Level world, @Nullable Entity entity, @Nullable DamageSource damageSource, @Nullable ExplosionDamageCalculator behavior, double x, double y, double z, float power, boolean createFire, Explosion.BlockInteraction destructionType, ParticleOptions particle, ParticleOptions emitterParticle, Holder soundEvent) { @@ -191,10 +191,10 @@ index 0022263a41b74fc339c5a5629aee3cd2cd05c5ae..0b553c9e90b53cdf84b14a5d5d20dc3c this.hitPlayers = Maps.newHashMap(); this.level = world; diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 0a0ab76144aa7d0970638924878f1eb130b2e3e3..a2ffd16c9351c484f0163f19f9352cd643f9b437 100644 +index f3c44a2ddc52661984cc07b2ee23b3a3431a4b0a..9ab004fa35687ca3274f7b937e5c379e93353c35 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -121,16 +121,16 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -123,16 +123,16 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl public final Thread thread; private final boolean isDebug; private int skyDarken; @@ -212,12 +212,12 @@ index 0a0ab76144aa7d0970638924878f1eb130b2e3e3..a2ffd16c9351c484f0163f19f9352cd6 + private final RandomSource threadSafeRandom = org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.ignoreThreadSafeRandom ? random : RandomSource.createThreadSafe(); // Plazma - Reduce create random instace private final Holder dimensionTypeRegistration; public final WritableLevelData levelData; - // private final Supplier profiler; // Plazma - Completely remove Mojang's Profiler + private final Supplier profiler; diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java -index fb9611866671880fc7a1a969da928b8f2ad15269..44962ecedf724e941e59913188afe4cfad252fc8 100644 +index 89df488afeffd0c060d2d0e7fae16daf978bd192..743223bacd9db48a1afb6896e7e27560eb4c39f7 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java -@@ -357,7 +357,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity { +@@ -268,7 +268,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity { } private static void spawnGatewayPortal(ServerLevel world, BlockPos pos, EndGatewayConfiguration config) { @@ -253,10 +253,10 @@ index 7bbe93966fa00b7001da53bf2f22f4d942b7cc22..6c5eececc83571b0f60e7f672ed185e1 } else if (flag1) { fight.setRespawnStage(SUMMONING_DRAGON); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java -index 18a1b4325cac81b040596071dab99ef9bf6f3142..ab492b184a4ecdefc423823fc72abd800b71f016 100644 +index 84300f2f7b7be4f5281edd8e263646dbcbb3ba07..3678c0f583becdec5baa292f81a5eff5663786bd 100644 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java -@@ -472,7 +472,7 @@ public class EndDragonFight { +@@ -474,7 +474,7 @@ public class EndDragonFight { this.level.registryAccess().registry(Registries.CONFIGURED_FEATURE).flatMap((iregistry) -> { return iregistry.getHolder(EndFeatures.END_GATEWAY_DELAYED); }).ifPresent((holder_c) -> { @@ -265,7 +265,7 @@ index 18a1b4325cac81b040596071dab99ef9bf6f3142..ab492b184a4ecdefc423823fc72abd80 }); } -@@ -490,7 +490,7 @@ public class EndDragonFight { +@@ -492,7 +492,7 @@ public class EndDragonFight { this.portalLocation = this.portalLocation.atY(this.level.getMinBuildHeight() + 1); } // Paper end - Prevent "softlocked" exit portal generation @@ -275,7 +275,7 @@ index 18a1b4325cac81b040596071dab99ef9bf6f3142..ab492b184a4ecdefc423823fc72abd80 this.level.getChunkSource().chunkMap.waitForLightBeforeSending(new ChunkPos(this.portalLocation), i); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java -index 95e35c223f2ad9b6de6749544abd68de71e4f1ab..492e0c1d00e8098d9a974f46c087a404ec67764e 100644 +index 759b6e54db93792c9862b1f1625118ac6fa49d7a..2dccc06d847af695806321b303b6d7cab89bcb7f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java @@ -14,11 +14,12 @@ import org.bukkit.inventory.meta.FireworkMeta; diff --git a/patches/unapplied/server/working/0018-Apply-various-optimizations.patch b/patches/server/0017-Apply-various-optimizations.patch similarity index 87% rename from patches/unapplied/server/working/0018-Apply-various-optimizations.patch rename to patches/server/0017-Apply-various-optimizations.patch index c1cb2df..9139b1c 100644 --- a/patches/unapplied/server/working/0018-Apply-various-optimizations.patch +++ b/patches/server/0017-Apply-various-optimizations.patch @@ -7,10 +7,10 @@ Subject: [PATCH] Apply various optimizations Akarin - Swaps the predicate order of collision diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f7201a74f66892c9d93616e9afb99d9499f0cdbc..3a9d8e64d0a02a40a89cd82e014ed1bebcd6b8b3 100644 +index 7aadcaa1785c6560eb1ce2f1179225facca47d84..2adc6f3400a2b914176d0ae0a85c479b00289fb4 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2209,8 +2209,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2211,8 +2211,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess public void playerTouch(Player player) {} public void push(Entity entity) { @@ -21,7 +21,7 @@ index f7201a74f66892c9d93616e9afb99d9499f0cdbc..3a9d8e64d0a02a40a89cd82e014ed1be if (this.level.paperConfig().collisions.onlyPlayersCollide && !(entity instanceof ServerPlayer || this instanceof ServerPlayer)) return; // Paper - Collision option for requiring a player participant double d0 = entity.getX() - this.getX(); double d1 = entity.getZ() - this.getZ(); -@@ -2238,8 +2239,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2240,8 +2241,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess entity.push(d0, 0.0D, d1); } } diff --git a/patches/unapplied/server/working/0019-Do-not-load-chunks-to-spawn-phantom.patch b/patches/server/0018-Do-not-load-chunks-to-spawn-phantom.patch similarity index 100% rename from patches/unapplied/server/working/0019-Do-not-load-chunks-to-spawn-phantom.patch rename to patches/server/0018-Do-not-load-chunks-to-spawn-phantom.patch diff --git a/patches/unapplied/server/working/0020-Add-option-to-disable-moved-to-quickly-check-for-spe.patch b/patches/server/0019-Add-option-to-disable-moved-to-quickly-check-for-spe.patch similarity index 92% rename from patches/unapplied/server/working/0020-Add-option-to-disable-moved-to-quickly-check-for-spe.patch rename to patches/server/0019-Add-option-to-disable-moved-to-quickly-check-for-spe.patch index 55807a6..eb510bf 100644 --- a/patches/unapplied/server/working/0020-Add-option-to-disable-moved-to-quickly-check-for-spe.patch +++ b/patches/server/0019-Add-option-to-disable-moved-to-quickly-check-for-spe.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Add option to disable moved to quickly check for specific diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 176e54f1c5f4feb98bee8876c304f6e248909e9c..2133251cc2ee2e50f0b830c9f5123d3d9e7a6430 100644 +index fd22a6709c7ffd828fbab5b8723f2b723af92f3d..79cfaf78840ac9052b83666d44cdd27f1ed3ae4f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1469,6 +1469,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1462,6 +1462,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl } // Paper end - Prevent moving into unloaded chunks