From 946f5672823348e7ece39c3e3b884aec11e702d6 Mon Sep 17 00:00:00 2001 From: Martijn Muijsers Date: Sun, 29 Jan 2023 22:10:08 +0100 Subject: [PATCH] Updated Upstream (Paper) --- gradle.properties | 2 +- .../0007-Player-canSee-by-entity-UUID.patch | 4 ++-- patches/server/0006-Gale-configuration.patch | 21 ++++++++----------- .../server/0014-Remove-vanilla-profiler.patch | 12 +++++------ .../0061-Do-not-log-Not-Secure-marker.patch | 8 +++---- patches/server/0073-Fix-MC-31819.patch | 4 ++-- ...logging-login-locations-configurable.patch | 4 ++-- .../0079-Reduce-array-allocations.patch | 14 ++++++------- ...-durability-change-equipment-updates.patch | 6 +++--- .../0111-Player-canSee-by-entity-UUID.patch | 4 ++-- ...2-Spread-out-sending-all-player-info.patch | 16 +++++++------- ...-player-list-for-sending-player-info.patch | 4 ++-- ...ncrease-time-statistics-in-intervals.patch | 4 ++-- .../0137-Optimize-identical-item-checks.patch | 4 ++-- patches/server/0145-Base-thread-pool.patch | 18 ++++++++-------- 15 files changed, 61 insertions(+), 64 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0690214..edc061b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=org.galemc.gale version=1.19.3-R0.1-SNAPSHOT mcVersion=1.19.3 -paperRef=78a91dfb48e5e3deefcc19796579e71a7dd89e40 +paperRef=4da844f1e3e375a24a0e518b0787ae909fa0e247 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/0007-Player-canSee-by-entity-UUID.patch b/patches/api/0007-Player-canSee-by-entity-UUID.patch index cc689ea..40133d7 100644 --- a/patches/api/0007-Player-canSee-by-entity-UUID.patch +++ b/patches/api/0007-Player-canSee-by-entity-UUID.patch @@ -37,10 +37,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 9f762cf670bf5db9138e468e72e57781d8d22f54..a729c8367cd755dd4e1e3dc314869b2136900158 100644 +index c68df5e5cc63b26da8623cf27e257ef07a61897d..a9f50779740e7fcec98ac8a88742858776a1fe05 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1466,6 +1466,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1509,6 +1509,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @org.jetbrains.annotations.ApiStatus.Experimental // Paper public boolean canSee(@NotNull Entity entity); diff --git a/patches/server/0006-Gale-configuration.patch b/patches/server/0006-Gale-configuration.patch index 60188a0..bf74abe 100644 --- a/patches/server/0006-Gale-configuration.patch +++ b/patches/server/0006-Gale-configuration.patch @@ -160,10 +160,10 @@ index a0aa1f1a7adf986d500a2135aa42e138aa3c4f08..6d19b985222d78750828fd2719c1fbf7 } } diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java -index 0b6d68350f608bb64a701d0e390283d50f12094e..3088d5f008a8cb5a75f1e11bd80a2614a4c1b75d 100644 +index 9fde9ccb5d069ddce8dd837ef1bc68b93ce66434..a82be9c7226348b6c8ed5edfa8dd8262b4f49f07 100644 --- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java +++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java -@@ -125,13 +125,13 @@ public class PaperConfigurations extends Configurations equipmentChanges) { diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 8fd080110ed4efaf6cb3a2561b32ed66ff8c78f0..b1a01ef0090718923aff4365d8e93c776a5ebae4 100644 +index 7626dfea095023343f041e0c5b6d0117873c1236..3cc1096880deea3eb5f50e38f4757455606e28c8 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java -@@ -720,10 +720,22 @@ public final class ItemStack { +@@ -721,10 +721,22 @@ public final class ItemStack { return left == right ? true : (!left.isEmpty() && !right.isEmpty() ? left.sameItem(right) : false); } diff --git a/patches/server/0111-Player-canSee-by-entity-UUID.patch b/patches/server/0111-Player-canSee-by-entity-UUID.patch index aa83e25..e500980 100644 --- a/patches/server/0111-Player-canSee-by-entity-UUID.patch +++ b/patches/server/0111-Player-canSee-by-entity-UUID.patch @@ -37,10 +37,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 99bf1485ddecb5fc88850242e9c32850781c4b36..53a5464aa0261d50ce9a0b7528af56f9436e3c1c 100644 +index 7c43de6ad6bd7259c6bcb2a55e312e8abfcf546b..d274e9373f7507dd38f2e0162c8a683b1ddde04e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1849,6 +1849,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1862,6 +1862,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return !this.hiddenEntities.containsKey(entity.getUniqueId()); } diff --git a/patches/server/0112-Spread-out-sending-all-player-info.patch b/patches/server/0112-Spread-out-sending-all-player-info.patch index 0f0a99f..64dd821 100644 --- a/patches/server/0112-Spread-out-sending-all-player-info.patch +++ b/patches/server/0112-Spread-out-sending-all-player-info.patch @@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 0c1192cb92de739f96a188b9a0775337eb3f6e2c..533d779060813a587cbd22d58031e2a36be5c1f9 100644 +index 91d009a0e48e68711f51aaf65d4c52c291f8b4b2..aa26e6796a5b2b8247b0336a61b0cf8f4b55aa9f 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -15,6 +15,8 @@ import java.net.SocketAddress; @@ -64,13 +64,13 @@ index 0c1192cb92de739f96a188b9a0775337eb3f6e2c..533d779060813a587cbd22d58031e2a3 private final IpBanList ipBans; @@ -301,6 +304,7 @@ public abstract class PlayerList { player.sendServerStatus(this.server.getStatus()); - player.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(this.players)); + // player.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(this.players)); // Paper - use single player info update packet this.players.add(player); + this.addToSendAllPlayerInfoBuckets(player); // Gale - Purpur - spread out sending all player info this.playersByName.put(player.getScoreboardName().toLowerCase(java.util.Locale.ROOT), player); // Spigot this.playersByUUID.put(player.getUUID(), player); // this.broadcastAll(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(entityplayer))); // CraftBukkit - replaced with loop below -@@ -628,6 +632,7 @@ public abstract class PlayerList { +@@ -634,6 +638,7 @@ public abstract class PlayerList { worldserver.removePlayerImmediately(entityplayer, Entity.RemovalReason.UNLOADED_WITH_PLAYER); entityplayer.getAdvancements().stopListening(); this.players.remove(entityplayer); @@ -78,7 +78,7 @@ index 0c1192cb92de739f96a188b9a0775337eb3f6e2c..533d779060813a587cbd22d58031e2a3 this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot this.server.getCustomBossEvents().onPlayerDisconnect(entityplayer); UUID uuid = entityplayer.getUUID(); -@@ -781,6 +786,7 @@ public abstract class PlayerList { +@@ -787,6 +792,7 @@ public abstract class PlayerList { // Paper end entityplayer.stopRiding(); // CraftBukkit this.players.remove(entityplayer); @@ -86,7 +86,7 @@ index 0c1192cb92de739f96a188b9a0775337eb3f6e2c..533d779060813a587cbd22d58031e2a3 this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot entityplayer.getLevel().removePlayerImmediately(entityplayer, Entity.RemovalReason.DISCARDED); BlockPos blockposition = entityplayer.getRespawnPosition(); -@@ -918,6 +924,7 @@ public abstract class PlayerList { +@@ -924,6 +930,7 @@ public abstract class PlayerList { if (!entityplayer.connection.isDisconnected()) { worldserver1.addRespawnedPlayer(entityplayer1); this.players.add(entityplayer1); @@ -94,7 +94,7 @@ index 0c1192cb92de739f96a188b9a0775337eb3f6e2c..533d779060813a587cbd22d58031e2a3 this.playersByName.put(entityplayer1.getScoreboardName().toLowerCase(java.util.Locale.ROOT), entityplayer1); // Spigot this.playersByUUID.put(entityplayer1.getUUID(), entityplayer1); } -@@ -968,20 +975,55 @@ public abstract class PlayerList { +@@ -974,20 +981,55 @@ public abstract class PlayerList { this.sendPlayerPermissionLevel(player, i); } @@ -157,7 +157,7 @@ index 0c1192cb92de739f96a188b9a0775337eb3f6e2c..533d779060813a587cbd22d58031e2a3 } 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 328a232a517789f2b619debe99b7c43d55be1940..78e662ef3dbf3e6941be7b8f20ca2a1501ca04e7 100644 +index e561886cb78f9455cee3607354e3c72401aba0dc..0efd68cfbcc3f6c1442bdc7163018f7640a06b20 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -40,6 +40,7 @@ import net.minecraft.network.syncher.SynchedEntityData; @@ -168,7 +168,7 @@ index 328a232a517789f2b619debe99b7c43d55be1940..78e662ef3dbf3e6941be7b8f20ca2a15 import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; -@@ -193,12 +194,15 @@ public abstract class Player extends LivingEntity { +@@ -194,12 +195,15 @@ public abstract class Player extends LivingEntity { } // CraftBukkit end diff --git a/patches/server/0113-Optimize-player-list-for-sending-player-info.patch b/patches/server/0113-Optimize-player-list-for-sending-player-info.patch index 5cf8b02..44b303a 100644 --- a/patches/server/0113-Optimize-player-list-for-sending-player-info.patch +++ b/patches/server/0113-Optimize-player-list-for-sending-player-info.patch @@ -37,10 +37,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 533d779060813a587cbd22d58031e2a36be5c1f9..e80346c56a6b47d684b49dfaa066fc0314fd59ae 100644 +index aa26e6796a5b2b8247b0336a61b0cf8f4b55aa9f..4662b789af0bbab91102234d47b5785075762a2e 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -1011,14 +1011,18 @@ public abstract class PlayerList { +@@ -1017,14 +1017,18 @@ public abstract class PlayerList { // Gale start - Purpur - spread out sending all player info ServerPlayer[] sendAllPlayerInfoBucket = this.sendAllPlayerInfoBuckets[this.sendAllPlayerInfoIn]; if (sendAllPlayerInfoBucket != null) { diff --git a/patches/server/0134-Increase-time-statistics-in-intervals.patch b/patches/server/0134-Increase-time-statistics-in-intervals.patch index 4ffb850..e9772b3 100644 --- a/patches/server/0134-Increase-time-statistics-in-intervals.patch +++ b/patches/server/0134-Increase-time-statistics-in-intervals.patch @@ -45,7 +45,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 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 78e662ef3dbf3e6941be7b8f20ca2a1501ca04e7..f8d90166f76663fdd49b6b2988e0e1559622a503 100644 +index 0efd68cfbcc3f6c1442bdc7163018f7640a06b20..23d3189b4d5c02254673d979cbaf1eda65d45e4b 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -114,6 +114,7 @@ import net.minecraft.world.phys.AABB; @@ -56,7 +56,7 @@ index 78e662ef3dbf3e6941be7b8f20ca2a1501ca04e7..f8d90166f76663fdd49b6b2988e0e155 import org.slf4j.Logger; import org.bukkit.craftbukkit.entity.CraftHumanEntity; import org.bukkit.craftbukkit.event.CraftEventFactory; -@@ -281,19 +282,24 @@ public abstract class Player extends LivingEntity { +@@ -282,19 +283,24 @@ public abstract class Player extends LivingEntity { this.moveCloak(); if (!this.level.isClientSide) { this.foodData.tick(this); diff --git a/patches/server/0137-Optimize-identical-item-checks.patch b/patches/server/0137-Optimize-identical-item-checks.patch index 445dde1..cedda38 100644 --- a/patches/server/0137-Optimize-identical-item-checks.patch +++ b/patches/server/0137-Optimize-identical-item-checks.patch @@ -7,10 +7,10 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index b1a01ef0090718923aff4365d8e93c776a5ebae4..c2160103d34c07f27cccf94613b9ae34dcd0c154 100644 +index 3cc1096880deea3eb5f50e38f4757455606e28c8..6a5452d6210bcc268d933f0051f1ce65f6dff4a1 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java -@@ -705,14 +705,29 @@ public final class ItemStack { +@@ -706,14 +706,29 @@ public final class ItemStack { } public static boolean tagMatches(ItemStack left, ItemStack right) { diff --git a/patches/server/0145-Base-thread-pool.patch b/patches/server/0145-Base-thread-pool.patch index 3f4d22b..c1c07c0 100644 --- a/patches/server/0145-Base-thread-pool.patch +++ b/patches/server/0145-Base-thread-pool.patch @@ -459,10 +459,10 @@ index cf6d50218769e3fecd12dbde70a03b5042feddf4..9d8ee965f7dcd0f416b7aa8368e34b91 } return global; diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java -index 3088d5f008a8cb5a75f1e11bd80a2614a4c1b75d..052ac3ee2a59995ae48f141b2b81b25e1c220f42 100644 +index a82be9c7226348b6c8ed5edfa8dd8262b4f49f07..47a3580caef45ffe71446c247d4e06e332b2fda2 100644 --- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java +++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java -@@ -285,7 +285,7 @@ public class PaperConfigurations extends Configurations