From aa9766f6b3f84063a014f33aeb973e0d00dfb867 Mon Sep 17 00:00:00 2001 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> Date: Sat, 3 Feb 2024 13:31:24 +0300 Subject: [PATCH] Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@03a732c Updated Upstream (Paper) --- gradle.properties | 2 +- patches/server/0002-Divine-Configuration.patch | 10 +++++----- patches/server/0010-Remove-Spigot-tick-limiter.patch | 6 +++--- patches/server/0014-Fix-MC-31819.patch | 4 ++-- patches/server/0022-Fix-MC-65198.patch | 10 +++++----- ...process-chat-commands-before-player-has-joine.patch | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6305769..aa8217d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = gq.bxteam.divinemc version = 1.20.4-R0.1-SNAPSHOT -purpurRef = 030cb9e4d31d47edd19ea690af60af1fe04e3db4 +purpurRef = 03a732c8eacd4eac7507d1220eaee381072c5866 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0002-Divine-Configuration.patch b/patches/server/0002-Divine-Configuration.patch index dd1e90e..c1db23d 100644 --- a/patches/server/0002-Divine-Configuration.patch +++ b/patches/server/0002-Divine-Configuration.patch @@ -347,10 +347,10 @@ index 043a48d8c90e2e008b06fb5a643378a0fa948aaa..3f29a112c781790577d2857aee18c66f this.setFlightAllowed(dedicatedserverproperties.allowFlight); this.setMotd(dedicatedserverproperties.motd); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index c37b1fb81e6e8a8af5d17420892ee930b31ca019..3d58fdb3bd2d359c032c5e781ca393a485ce494f 100644 +index bc797f1872f86b59a8aae3e70823249c9b8d8922..48cb02cb0208dadfcfebac6bfc04013458416c18 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -15,6 +15,8 @@ import java.util.function.Consumer; +@@ -10,6 +10,8 @@ import java.util.function.Consumer; import java.util.function.Predicate; import java.util.function.Supplier; import javax.annotation.Nullable; @@ -359,7 +359,7 @@ index c37b1fb81e6e8a8af5d17420892ee930b31ca019..3d58fdb3bd2d359c032c5e781ca393a4 import net.minecraft.CrashReport; import net.minecraft.CrashReportCategory; import net.minecraft.ReportedException; -@@ -179,6 +181,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -174,6 +176,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray public final org.purpurmc.purpur.PurpurWorldConfig purpurConfig; // Purpur @@ -367,7 +367,7 @@ index c37b1fb81e6e8a8af5d17420892ee930b31ca019..3d58fdb3bd2d359c032c5e781ca393a4 public final co.aikar.timings.WorldTimingsHandler timings; // Paper public static BlockPos lastPhysicsProblem; // Spigot private org.spigotmc.TickLimiter entityLimiter; -@@ -262,6 +265,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -257,6 +260,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config this.purpurConfig = new org.purpurmc.purpur.PurpurWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Purpur @@ -376,7 +376,7 @@ index c37b1fb81e6e8a8af5d17420892ee930b31ca019..3d58fdb3bd2d359c032c5e781ca393a4 this.generator = gen; 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 300779d8efa27be355206ce0f71d9015de72d30c..9e110e463944a710c20cfcfbc236c058fef5738e 100644 +index bdaf8f70f9684cf8ed1d19f4e1138c728ba9ebbe..5f27cf0da02470ddb39c136a350adc512cd98200 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -14,6 +14,7 @@ import com.mojang.brigadier.tree.CommandNode; diff --git a/patches/server/0010-Remove-Spigot-tick-limiter.patch b/patches/server/0010-Remove-Spigot-tick-limiter.patch index b5ffb11..56b19c1 100644 --- a/patches/server/0010-Remove-Spigot-tick-limiter.patch +++ b/patches/server/0010-Remove-Spigot-tick-limiter.patch @@ -7,10 +7,10 @@ Original code by Titaniumtown, modified by NONPLAYT You can find the original code on https://gitlab.com/Titaniumtown/JettPack diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 6d64f75c4996cb4ee22876c7822d03da7af0918b..e1409a225fc775ad52ff7bd57ec17ca2177d608b 100644 +index 48cb02cb0208dadfcfebac6bfc04013458416c18..6691f6ab2085bf2ba9e9797d056951e559cec757 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -184,8 +184,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -179,8 +179,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { public final gq.bxteam.divinemc.configuration.DivineWorldConfig divinemcConfig; // DivineMC public final co.aikar.timings.WorldTimingsHandler timings; // Paper public static BlockPos lastPhysicsProblem; // Spigot @@ -19,7 +19,7 @@ index 6d64f75c4996cb4ee22876c7822d03da7af0918b..e1409a225fc775ad52ff7bd57ec17ca2 private int tileTickPosition; public final Map explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions public java.util.ArrayDeque redstoneUpdateInfos; // Paper - Faster redstone torch rapid clock removal; Move from Map in BlockRedstoneTorch to here -@@ -347,9 +345,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -342,9 +340,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { }); // CraftBukkit end this.timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings diff --git a/patches/server/0014-Fix-MC-31819.patch b/patches/server/0014-Fix-MC-31819.patch index a1ec2e1..de41967 100644 --- a/patches/server/0014-Fix-MC-31819.patch +++ b/patches/server/0014-Fix-MC-31819.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix MC-31819 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 208189cec91b298b5843473f065c5372ef67f20d..f5e5cda82ad85db9a92b5f26c920f8a915ad2b7b 100644 +index dfc73cd1b4fd9a2572a71b653e6e3d9133ec634c..2726f34d88aecf92f90396f760f6a333fbe5bebf 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -1903,6 +1903,11 @@ public abstract class Player extends LivingEntity { +@@ -1905,6 +1905,11 @@ public abstract class Player extends LivingEntity { } public void causeFoodExhaustion(float f, EntityExhaustionEvent.ExhaustionReason reason) { diff --git a/patches/server/0022-Fix-MC-65198.patch b/patches/server/0022-Fix-MC-65198.patch index 42dd507..f71a8a6 100644 --- a/patches/server/0022-Fix-MC-65198.patch +++ b/patches/server/0022-Fix-MC-65198.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix MC-65198 Original post on Mojira: https://bugs.mojang.com/browse/MC-65198 diff --git a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java -index a578882b64c581ef4f47fa483a9f2988cfa4c8cf..0660c07e1f360cb5e0a865a6b7574ea14a327f10 100644 +index 3756de835ea87e3a4fb87cbf77365ffd87957ea9..e5f40f0a8702c98914384e9ffd204da888f39262 100644 --- a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java +++ b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java @@ -141,6 +141,7 @@ public abstract class ItemCombinerMenu extends AbstractContainerMenu { @@ -27,7 +27,7 @@ index a578882b64c581ef4f47fa483a9f2988cfa4c8cf..0660c07e1f360cb5e0a865a6b7574ea1 } diff --git a/src/main/java/net/minecraft/world/inventory/ResultSlot.java b/src/main/java/net/minecraft/world/inventory/ResultSlot.java -index 8c97a7269040436cacc65fd182fa8e5f931b6c16..bf0335e1441d99844777eb8aa83db0d6d774aa9d 100644 +index 245731757f2593c736916ac6ee59e2c91d179934..537991e3b46d65f4313c42997d7f199a2796241b 100644 --- a/src/main/java/net/minecraft/world/inventory/ResultSlot.java +++ b/src/main/java/net/minecraft/world/inventory/ResultSlot.java @@ -45,7 +45,7 @@ public class ResultSlot extends Slot { @@ -40,10 +40,10 @@ index 8c97a7269040436cacc65fd182fa8e5f931b6c16..bf0335e1441d99844777eb8aa83db0d6 Container var3 = this.container; diff --git a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java -index f8129dcdcae12ed66ec58e8c749fa88ec3cd85d8..c90eed190d059dc5eb923cda39019a754d19ed05 100644 +index eade15820dd9db38b6af2a5c4314acfb14ca03e9..3cb6a347b3269cb8b451798c7d1606227ebca007 100644 --- a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java +++ b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java -@@ -258,6 +258,7 @@ public class StonecutterMenu extends AbstractContainerMenu { +@@ -259,6 +259,7 @@ public class StonecutterMenu extends AbstractContainerMenu { Item item = itemstack1.getItem(); itemstack = itemstack1.copy(); @@ -51,7 +51,7 @@ index f8129dcdcae12ed66ec58e8c749fa88ec3cd85d8..c90eed190d059dc5eb923cda39019a75 if (slot == 1) { item.onCraftedBy(itemstack1, player.level(), player); if (!this.moveItemStackTo(itemstack1, 2, 38, true)) { -@@ -290,7 +291,7 @@ public class StonecutterMenu extends AbstractContainerMenu { +@@ -291,7 +292,7 @@ public class StonecutterMenu extends AbstractContainerMenu { return ItemStack.EMPTY; } diff --git a/patches/server/0026-Do-not-process-chat-commands-before-player-has-joine.patch b/patches/server/0026-Do-not-process-chat-commands-before-player-has-joine.patch index 2b10bdb..d5bd871 100644 --- a/patches/server/0026-Do-not-process-chat-commands-before-player-has-joine.patch +++ b/patches/server/0026-Do-not-process-chat-commands-before-player-has-joine.patch @@ -19,7 +19,7 @@ index fa7ee2b2778a26d0e466bdc05ade26a5ae0c17f4..11dc1af9f8d8ce8c0a855d14a35077f5 + } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index af592c7c82471d75381d77e43c8f81b525df217d..3de8e2f0c0eaad8527cd2ab35c624a47515b85f0 100644 +index 8352ac55efdfb2ff56c667ceaa0e4d7ce5365a23..c2cb9d6fd3587f33b95b1b60a0f9979a04739706 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -6,6 +6,7 @@ import com.mojang.authlib.GameProfile; @@ -30,7 +30,7 @@ index af592c7c82471d75381d77e43c8f81b525df217d..3de8e2f0c0eaad8527cd2ab35c624a47 import it.unimi.dsi.fastutil.ints.Int2ObjectMap.Entry; import it.unimi.dsi.fastutil.ints.Int2ObjectMaps; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; -@@ -2324,6 +2325,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2323,6 +2324,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false)); return Optional.empty();