From 8930cf1b0564316d4c5da3c3e0dcfc9132a9a2fe Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Wed, 24 Apr 2024 03:09:04 -0400 Subject: [PATCH] Updated Upstream (Paper) --- gradle.properties | 2 +- patches/server/0017-Remove-vanilla-profiler.patch | 6 +++--- .../server/0063-Do-not-log-Not-Secure-marker.patch | 9 +++++---- patches/server/0078-Reduce-array-allocations.patch | 6 +++--- patches/server/0079-Optimize-sun-burn-tick.patch | 6 +++--- .../server/0093-Update-boss-bar-within-tick.patch | 14 +++++++------- .../server/0094-Cache-ominous-banner-item.patch | 6 +++--- .../0110-Send-multiple-keep-alive-packets.patch | 4 ++-- .../0134-Reduce-RandomSource-instances.patch | 6 +++--- 9 files changed, 30 insertions(+), 29 deletions(-) diff --git a/gradle.properties b/gradle.properties index a4b2f6e..4766492 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=org.galemc.gale version=1.20.4-R0.1-SNAPSHOT mcVersion=1.20.4 -paperRef=862299b6a6588ff60db69dbc40e8514f9690d318 +paperRef=f4c7d373e4a1aff23539fe099745bf29a28559b9 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0017-Remove-vanilla-profiler.patch b/patches/server/0017-Remove-vanilla-profiler.patch index a003ca9..6b83a60 100644 --- a/patches/server/0017-Remove-vanilla-profiler.patch +++ b/patches/server/0017-Remove-vanilla-profiler.patch @@ -164,7 +164,7 @@ index e9775b4506909bee65a74964f0d5391a0513de1d..1c4dd8acdcd571aceffe4b78599ca2c7 } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4062e400c4ad6f46e80405ec45864925a9e40ea9..d86c888095ca360bccca515dc4941f46c6944e0e 100644 +index f551044d6cebaec0f2fe8668900727b0157bb6f3..ba7338ca9b025dcb30697ebf4b9db24c970ecd55 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -106,18 +106,9 @@ import net.minecraft.util.RandomSource; @@ -475,7 +475,7 @@ index 4062e400c4ad6f46e80405ec45864925a9e40ea9..d86c888095ca360bccca515dc4941f46 public int getMaxChainedNeighborUpdates() { return 1000000; } -@@ -2849,56 +2721,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop msgFunction) { final PlayerChatMessage toConsoleMessage = msgFunction == null ? ChatProcessor.this.message : ChatProcessor.this.message.withUnsignedContent(msgFunction.apply(ChatProcessor.this.server.console)); diff --git a/patches/server/0078-Reduce-array-allocations.patch b/patches/server/0078-Reduce-array-allocations.patch index b230be7..181fbec 100644 --- a/patches/server/0078-Reduce-array-allocations.patch +++ b/patches/server/0078-Reduce-array-allocations.patch @@ -434,7 +434,7 @@ index d5e9c65d8664f509bec419fddc7b85042473268e..9805ee5989d813f45b5b0829d73ebce3 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 f5d6bf230ec6ec24ae22669b32ce6e85388475c3..c9f3ac6f18eddb3f45024c562e7d1bfb9730e9d2 100644 +index 26ff2e2ffb7cbc206a4a52600f173a4dcd084ac2..6d7d6858c021d2d14a83bbe40404c749c449e589 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -28,6 +28,8 @@ import java.util.function.UnaryOperator; @@ -616,7 +616,7 @@ index 9c85df84d820ff664b446cfbcb6cf322dde7289b..4489bd7c6b29ea6db432e62bb113fdc9 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 dee9ee5e5917f48b8e1c078710c6d67de6de78d5..32f2132ead256e18531fa1abdd5e764f35573cd6 100644 +index c7f328945ac11626bab2724475c2aa41a69fffa0..9df992ca013db3f54026aa5ebd3eb3d49b7c3969 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -1063,7 +1063,7 @@ public abstract class Mob extends LivingEntity implements Targeting { @@ -646,7 +646,7 @@ index dee9ee5e5917f48b8e1c078710c6d67de6de78d5..32f2132ead256e18531fa1abdd5e764f int i = aenumitemslot.length; for (int j = 0; j < i; ++j) { -@@ -1432,7 +1432,7 @@ public abstract class Mob extends LivingEntity implements Targeting { +@@ -1433,7 +1433,7 @@ public abstract class Mob extends LivingEntity implements Targeting { t0.setInvulnerable(this.isInvulnerable()); if (flag) { t0.setCanPickUpLoot(this.canPickUpLoot()); diff --git a/patches/server/0079-Optimize-sun-burn-tick.patch b/patches/server/0079-Optimize-sun-burn-tick.patch index 9879a3a..9fa7f9e 100644 --- a/patches/server/0079-Optimize-sun-burn-tick.patch +++ b/patches/server/0079-Optimize-sun-burn-tick.patch @@ -13,7 +13,7 @@ As part of: JettPack (https://gitlab.com/Titaniumtown/JettPack) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index dcee4af35f44f0dfe35ca95551cabedae4ea9f9e..7db079ab7670be9cfb72c3f2efa492fabb469405 100644 +index 8d43764a305b4a7fcc34abc041dac735fc168e62..8e4314b4c8acc059dfc5878d4982fa9a6ba9fab1 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -308,7 +308,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -45,10 +45,10 @@ index dcee4af35f44f0dfe35ca95551cabedae4ea9f9e..7db079ab7670be9cfb72c3f2efa492fa 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 32f2132ead256e18531fa1abdd5e764f35573cd6..a676228a7f4d8d4b7e54a641c1df1f1b0d262f10 100644 +index 9df992ca013db3f54026aa5ebd3eb3d49b7c3969..33afd520babc33c5b296b39e2bd6c3586230cd84 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -1698,13 +1698,29 @@ public abstract class Mob extends LivingEntity implements Targeting { +@@ -1699,13 +1699,29 @@ public abstract class Mob extends LivingEntity implements Targeting { } diff --git a/patches/server/0093-Update-boss-bar-within-tick.patch b/patches/server/0093-Update-boss-bar-within-tick.patch index c378bc8..1acdba3 100644 --- a/patches/server/0093-Update-boss-bar-within-tick.patch +++ b/patches/server/0093-Update-boss-bar-within-tick.patch @@ -13,18 +13,18 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) 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 eaa2943b667967f93f28d9d794d702fdaeb670ec..5a0a6de4c6f0d554b9efbb8b3dcf4e0c5bee7baf 100644 +index bf2c23fad919820512ce031cf28a000b249b2876..d422f6fee7c0fb5ee2f751ede3b894846e61374c 100644 --- a/src/main/java/net/minecraft/world/entity/raid/Raid.java +++ b/src/main/java/net/minecraft/world/entity/raid/Raid.java -@@ -106,6 +106,7 @@ public class Raid { - private Raid.RaidStatus status; - private int celebrationTicks; - private Optional waveSpawnPos; +@@ -111,6 +111,7 @@ public class Raid { + private static final org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry PDC_TYPE_REGISTRY = new org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry(); + public final org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer persistentDataContainer = new org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer(PDC_TYPE_REGISTRY); + // Paper end + private boolean isBarDirty; // Gale - Lithium - update boss bar within tick public Raid(int id, ServerLevel world, BlockPos pos) { this.raidEvent = new ServerBossEvent(Raid.RAID_NAME_COMPONENT, BossEvent.BossBarColor.RED, BossEvent.BossBarOverlay.NOTCHED_10); -@@ -272,6 +273,12 @@ public class Raid { +@@ -282,6 +283,12 @@ public class Raid { } public void tick() { @@ -37,7 +37,7 @@ index eaa2943b667967f93f28d9d794d702fdaeb670ec..5a0a6de4c6f0d554b9efbb8b3dcf4e0c if (!this.isStopped()) { if (this.status == Raid.RaidStatus.ONGOING) { boolean flag = this.active; -@@ -642,6 +649,12 @@ public class Raid { +@@ -652,6 +659,12 @@ public class Raid { } public void updateBossbar() { diff --git a/patches/server/0094-Cache-ominous-banner-item.patch b/patches/server/0094-Cache-ominous-banner-item.patch index 951b2db..b484c9b 100644 --- a/patches/server/0094-Cache-ominous-banner-item.patch +++ b/patches/server/0094-Cache-ominous-banner-item.patch @@ -26,10 +26,10 @@ index 96f5ccfa0369ca5dd7a327126dbe9b3cfe86ec1b..e4f1c486639d3488b40fe22ac6c4764c public boolean matches(@Nullable Entity entity) { 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 5a0a6de4c6f0d554b9efbb8b3dcf4e0c5bee7baf..ea0df00966cf9900a8a0153099bbb04e5b47116d 100644 +index d422f6fee7c0fb5ee2f751ede3b894846e61374c..541f6491b8578ba9681b6937f9df02b1a742a5cd 100644 --- a/src/main/java/net/minecraft/world/entity/raid/Raid.java +++ b/src/main/java/net/minecraft/world/entity/raid/Raid.java -@@ -706,7 +706,7 @@ public class Raid { +@@ -716,7 +716,7 @@ public class Raid { this.level.getRaids().setDirty(); } @@ -38,7 +38,7 @@ index 5a0a6de4c6f0d554b9efbb8b3dcf4e0c5bee7baf..ea0df00966cf9900a8a0153099bbb04e ItemStack itemstack = new ItemStack(Items.WHITE_BANNER); CompoundTag nbttagcompound = new CompoundTag(); ListTag nbttaglist = (new BannerPattern.Builder()).addPattern(BannerPatterns.RHOMBUS_MIDDLE, DyeColor.CYAN).addPattern(BannerPatterns.STRIPE_BOTTOM, DyeColor.LIGHT_GRAY).addPattern(BannerPatterns.STRIPE_CENTER, DyeColor.GRAY).addPattern(BannerPatterns.BORDER, DyeColor.LIGHT_GRAY).addPattern(BannerPatterns.STRIPE_MIDDLE, DyeColor.BLACK).addPattern(BannerPatterns.HALF_HORIZONTAL, DyeColor.LIGHT_GRAY).addPattern(BannerPatterns.CIRCLE_MIDDLE, DyeColor.LIGHT_GRAY).addPattern(BannerPatterns.BORDER, DyeColor.BLACK).toListTag(); -@@ -718,6 +718,14 @@ public class Raid { +@@ -728,6 +728,14 @@ public class Raid { return itemstack; } diff --git a/patches/server/0110-Send-multiple-keep-alive-packets.patch b/patches/server/0110-Send-multiple-keep-alive-packets.patch index d81a9cc..171a313 100644 --- a/patches/server/0110-Send-multiple-keep-alive-packets.patch +++ b/patches/server/0110-Send-multiple-keep-alive-packets.patch @@ -129,7 +129,7 @@ index e7583996cc6d750cbd72f749de39ecded56d7f7c..d791c2f2facfc46d8664225c8b28f95f } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c9f3ac6f18eddb3f45024c562e7d1bfb9730e9d2..ec0cf74e977d3ba4cbd43572af8f7fd4a496462f 100644 +index 6d7d6858c021d2d14a83bbe40404c749c449e589..718616e97de1442930dc755c83c58946800f28d8 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -8,6 +8,8 @@ import com.mojang.brigadier.StringReader; @@ -141,7 +141,7 @@ index c9f3ac6f18eddb3f45024c562e7d1bfb9730e9d2..ec0cf74e977d3ba4cbd43572af8f7fd4 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectIterator; import java.net.SocketAddress; -@@ -3400,6 +3402,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -3413,6 +3415,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl } @Override diff --git a/patches/server/0134-Reduce-RandomSource-instances.patch b/patches/server/0134-Reduce-RandomSource-instances.patch index 701c28b..b487d18 100644 --- a/patches/server/0134-Reduce-RandomSource-instances.patch +++ b/patches/server/0134-Reduce-RandomSource-instances.patch @@ -74,10 +74,10 @@ index 91497f5e6c07fcf1b05eca6846c51e1a15ed3bc0..32ba46c80b083cb3ef47bc0d4d393809 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 ea0df00966cf9900a8a0153099bbb04e5b47116d..1168465f6b9414b08680660413c62967cd1e95ee 100644 +index 541f6491b8578ba9681b6937f9df02b1a742a5cd..e5b2329efdddb697d9a50462f6a1910482e00af4 100644 --- a/src/main/java/net/minecraft/world/entity/raid/Raid.java +++ b/src/main/java/net/minecraft/world/entity/raid/Raid.java -@@ -110,7 +110,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); @@ -86,7 +86,7 @@ index ea0df00966cf9900a8a0153099bbb04e5b47116d..1168465f6b9414b08680660413c62967 this.waveSpawnPos = Optional.empty(); this.id = id; this.level = world; -@@ -124,7 +124,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);