diff --git a/patches/server/0073-Make-logging-login-locations-configurable.patch b/patches/server/0073-Make-logging-login-locations-configurable.patch new file mode 100644 index 0000000..09d4849 --- /dev/null +++ b/patches/server/0073-Make-logging-login-locations-configurable.patch @@ -0,0 +1,44 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Martijn Muijsers +Date: Mon, 26 Dec 2022 00:17:40 +0100 +Subject: [PATCH] Make logging login locations configurable + +License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) +Gale - https://galemc.org + +This patch is based on the following patch: +"configurable logging of player login location" +By: Simon Gardling +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/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java +index 8a59fade265e586622bcaa2cab2772613f9391aa..b4c97cf1755e95bb8f2547d0b4def2d9e0834e8d 100644 +--- a/src/main/java/net/minecraft/server/players/PlayerList.java ++++ b/src/main/java/net/minecraft/server/players/PlayerList.java +@@ -453,7 +453,13 @@ public abstract class PlayerList { + } + // Paper end + // CraftBukkit - Moved from above, added world ++ if (GaleGlobalConfiguration.get().logToConsole.playerLoginLocations) { // Gale - JettPack - make logging login location configurable + PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", player.getName().getString(), s1, player.getId(), worldserver1.serverLevelData.getLevelName(), player.getX(), player.getY(), player.getZ()); ++ // Gale start - JettPack - make logging login location configurable ++ } else { ++ PlayerList.LOGGER.info("{}[{}] logged in with entity id {}", player.getName().getString(), s1, player.getId()); ++ } ++ // Gale end - JettPack - make logging login location configurable + } + + public void updateEntireScoreboard(ServerScoreboard scoreboard, ServerPlayer player) { +diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +index 2d8d042112db908d76da023329f16402791029aa..58f9d024f5a17c2d28d89f740e04f638fe3a2a92 100644 +--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java ++++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +@@ -88,6 +88,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart { + public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks + public boolean unrecognizedRecipes = false; // Gale - Purpur - do not log unrecognized recipes + public boolean legacyMaterialInitialization = false; // Gale - Purpur - do not log legacy Material initialization ++ public boolean playerLoginLocations = true; // Gale - JettPack - make logging login location configurable + + public Chat chat; + public class Chat extends ConfigurationPart { diff --git a/patches/server/0073-Reduce-array-allocations.patch b/patches/server/0074-Reduce-array-allocations.patch similarity index 99% rename from patches/server/0073-Reduce-array-allocations.patch rename to patches/server/0074-Reduce-array-allocations.patch index d8d55ce..063baae 100644 --- a/patches/server/0073-Reduce-array-allocations.patch +++ b/patches/server/0074-Reduce-array-allocations.patch @@ -588,7 +588,7 @@ index 3f7fab2f80ded9a7a720bd623f1ef028a4d0dca6..2ed3f42b1e487374287d033ac634a922 final String s; diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 8a59fade265e586622bcaa2cab2772613f9391aa..ede2eb274ca715dccfbfd98e0e2c410990508ced 100644 +index b4c97cf1755e95bb8f2547d0b4def2d9e0834e8d..05eb03bb11b65ea09780b67926585aaf50581647 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -27,6 +27,8 @@ import java.util.UUID; @@ -608,7 +608,7 @@ index 8a59fade265e586622bcaa2cab2772613f9391aa..ede2eb274ca715dccfbfd98e0e2c4109 import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerChangedWorldEvent; import org.bukkit.event.player.PlayerJoinEvent; -@@ -675,7 +676,7 @@ public abstract class PlayerList { +@@ -681,7 +682,7 @@ public abstract class PlayerList { while (iterator.hasNext()) { entityplayer = (ServerPlayer) iterator.next(); this.save(entityplayer); // CraftBukkit - Force the player's inventory to be saved diff --git a/patches/server/0074-Optimize-sun-burn-tick.patch b/patches/server/0075-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0074-Optimize-sun-burn-tick.patch rename to patches/server/0075-Optimize-sun-burn-tick.patch diff --git a/patches/server/0075-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0076-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0075-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0076-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0076-Replace-AI-goal-set-with-optimized-collection.patch b/patches/server/0077-Replace-AI-goal-set-with-optimized-collection.patch similarity index 100% rename from patches/server/0076-Replace-AI-goal-set-with-optimized-collection.patch rename to patches/server/0077-Replace-AI-goal-set-with-optimized-collection.patch diff --git a/patches/server/0077-Replace-game-rules-map-with-optimized-collection.patch b/patches/server/0078-Replace-game-rules-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0077-Replace-game-rules-map-with-optimized-collection.patch rename to patches/server/0078-Replace-game-rules-map-with-optimized-collection.patch diff --git a/patches/server/0078-Replace-AI-attributes-with-optimized-collections.patch b/patches/server/0079-Replace-AI-attributes-with-optimized-collections.patch similarity index 100% rename from patches/server/0078-Replace-AI-attributes-with-optimized-collections.patch rename to patches/server/0079-Replace-AI-attributes-with-optimized-collections.patch diff --git a/patches/server/0079-Replace-class-map-with-optimized-collection.patch b/patches/server/0080-Replace-class-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0079-Replace-class-map-with-optimized-collection.patch rename to patches/server/0080-Replace-class-map-with-optimized-collection.patch diff --git a/patches/server/0080-Replace-throttle-tracker-map-with-optimized-collecti.patch b/patches/server/0081-Replace-throttle-tracker-map-with-optimized-collecti.patch similarity index 100% rename from patches/server/0080-Replace-throttle-tracker-map-with-optimized-collecti.patch rename to patches/server/0081-Replace-throttle-tracker-map-with-optimized-collecti.patch diff --git a/patches/server/0081-Replace-shape-full-block-cache-with-hashtable.patch b/patches/server/0082-Replace-shape-full-block-cache-with-hashtable.patch similarity index 100% rename from patches/server/0081-Replace-shape-full-block-cache-with-hashtable.patch rename to patches/server/0082-Replace-shape-full-block-cache-with-hashtable.patch diff --git a/patches/server/0082-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0083-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from patches/server/0082-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to patches/server/0083-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/patches/server/0083-Cache-BlockStatePairKey-hash.patch b/patches/server/0084-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from patches/server/0083-Cache-BlockStatePairKey-hash.patch rename to patches/server/0084-Cache-BlockStatePairKey-hash.patch diff --git a/patches/server/0084-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0085-Cache-CubeVoxelShape-shape-array.patch similarity index 100% rename from patches/server/0084-Cache-CubeVoxelShape-shape-array.patch rename to patches/server/0085-Cache-CubeVoxelShape-shape-array.patch diff --git a/patches/server/0085-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0086-Replace-division-by-multiplication-in-CubePointRange.patch similarity index 100% rename from patches/server/0085-Replace-division-by-multiplication-in-CubePointRange.patch rename to patches/server/0086-Replace-division-by-multiplication-in-CubePointRange.patch diff --git a/patches/server/0086-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0087-Replace-parts-by-size-in-CubePointRange.patch similarity index 100% rename from patches/server/0086-Replace-parts-by-size-in-CubePointRange.patch rename to patches/server/0087-Replace-parts-by-size-in-CubePointRange.patch diff --git a/patches/server/0087-Check-frozen-ticks-before-landing-block.patch b/patches/server/0088-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from patches/server/0087-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0088-Check-frozen-ticks-before-landing-block.patch diff --git a/patches/server/0088-Faster-chunk-serialization.patch b/patches/server/0089-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0088-Faster-chunk-serialization.patch rename to patches/server/0089-Faster-chunk-serialization.patch diff --git a/patches/server/0089-Update-boss-bar-within-tick.patch b/patches/server/0090-Update-boss-bar-within-tick.patch similarity index 100% rename from patches/server/0089-Update-boss-bar-within-tick.patch rename to patches/server/0090-Update-boss-bar-within-tick.patch diff --git a/patches/server/0090-Cache-ominous-banner-item.patch b/patches/server/0091-Cache-ominous-banner-item.patch similarity index 100% rename from patches/server/0090-Cache-ominous-banner-item.patch rename to patches/server/0091-Cache-ominous-banner-item.patch diff --git a/patches/server/0091-Precompute-piston-shapes.patch b/patches/server/0092-Precompute-piston-shapes.patch similarity index 100% rename from patches/server/0091-Precompute-piston-shapes.patch rename to patches/server/0092-Precompute-piston-shapes.patch diff --git a/patches/server/0092-Optimize-world-generation-chunk-and-block-access.patch b/patches/server/0093-Optimize-world-generation-chunk-and-block-access.patch similarity index 100% rename from patches/server/0092-Optimize-world-generation-chunk-and-block-access.patch rename to patches/server/0093-Optimize-world-generation-chunk-and-block-access.patch diff --git a/patches/server/0093-Cache-world-generator-sea-level.patch b/patches/server/0094-Cache-world-generator-sea-level.patch similarity index 100% rename from patches/server/0093-Cache-world-generator-sea-level.patch rename to patches/server/0094-Cache-world-generator-sea-level.patch diff --git a/patches/server/0094-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0095-Skip-secondary-POI-sensor-if-absent.patch similarity index 100% rename from patches/server/0094-Skip-secondary-POI-sensor-if-absent.patch rename to patches/server/0095-Skip-secondary-POI-sensor-if-absent.patch diff --git a/patches/server/0095-Optimize-villager-data-storage.patch b/patches/server/0096-Optimize-villager-data-storage.patch similarity index 100% rename from patches/server/0095-Optimize-villager-data-storage.patch rename to patches/server/0096-Optimize-villager-data-storage.patch diff --git a/patches/server/0096-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0097-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0096-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0097-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0097-Store-mob-counts-in-an-array.patch b/patches/server/0098-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0097-Store-mob-counts-in-an-array.patch rename to patches/server/0098-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0098-Use-linked-map-for-entity-trackers.patch b/patches/server/0099-Use-linked-map-for-entity-trackers.patch similarity index 100% rename from patches/server/0098-Use-linked-map-for-entity-trackers.patch rename to patches/server/0099-Use-linked-map-for-entity-trackers.patch diff --git a/patches/server/0099-Optimize-noise-generation.patch b/patches/server/0100-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0099-Optimize-noise-generation.patch rename to patches/server/0100-Optimize-noise-generation.patch diff --git a/patches/server/0100-Optimize-sheep-offspring-color.patch b/patches/server/0101-Optimize-sheep-offspring-color.patch similarity index 100% rename from patches/server/0100-Optimize-sheep-offspring-color.patch rename to patches/server/0101-Optimize-sheep-offspring-color.patch diff --git a/patches/server/0101-Ignore-durability-change-equipment-updates.patch b/patches/server/0102-Ignore-durability-change-equipment-updates.patch similarity index 100% rename from patches/server/0101-Ignore-durability-change-equipment-updates.patch rename to patches/server/0102-Ignore-durability-change-equipment-updates.patch diff --git a/patches/server/0102-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0103-Hide-flames-on-entities-with-fire-resistance.patch similarity index 100% rename from patches/server/0102-Hide-flames-on-entities-with-fire-resistance.patch rename to patches/server/0103-Hide-flames-on-entities-with-fire-resistance.patch diff --git a/patches/server/0103-Skip-cloning-advancement-criteria.patch b/patches/server/0104-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0103-Skip-cloning-advancement-criteria.patch rename to patches/server/0104-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0104-Reduce-block-destruction-packet-allocations.patch b/patches/server/0105-Reduce-block-destruction-packet-allocations.patch similarity index 100% rename from patches/server/0104-Reduce-block-destruction-packet-allocations.patch rename to patches/server/0105-Reduce-block-destruction-packet-allocations.patch diff --git a/patches/server/0105-Send-set-head-rotation-packets-only-for-living-entit.patch b/patches/server/0106-Send-set-head-rotation-packets-only-for-living-entit.patch similarity index 100% rename from patches/server/0105-Send-set-head-rotation-packets-only-for-living-entit.patch rename to patches/server/0106-Send-set-head-rotation-packets-only-for-living-entit.patch diff --git a/patches/server/0106-Player-canSee-by-entity-UUID.patch b/patches/server/0107-Player-canSee-by-entity-UUID.patch similarity index 100% rename from patches/server/0106-Player-canSee-by-entity-UUID.patch rename to patches/server/0107-Player-canSee-by-entity-UUID.patch diff --git a/patches/server/0107-Spread-out-sending-all-player-info.patch b/patches/server/0108-Spread-out-sending-all-player-info.patch similarity index 97% rename from patches/server/0107-Spread-out-sending-all-player-info.patch rename to patches/server/0108-Spread-out-sending-all-player-info.patch index ca2b4f2..8b2da73 100644 --- a/patches/server/0107-Spread-out-sending-all-player-info.patch +++ b/patches/server/0108-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 ede2eb274ca715dccfbfd98e0e2c410990508ced..d2fc479811087a7536fbe1226ae2efa02ca700db 100644 +index 05eb03bb11b65ea09780b67926585aaf50581647..7ff8d687818dd8f5a822f49f8c612b7833eafc4d 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; @@ -70,7 +70,7 @@ index ede2eb274ca715dccfbfd98e0e2c410990508ced..d2fc479811087a7536fbe1226ae2efa0 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 -@@ -622,6 +626,7 @@ public abstract class PlayerList { +@@ -628,6 +632,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 ede2eb274ca715dccfbfd98e0e2c410990508ced..d2fc479811087a7536fbe1226ae2efa0 this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot this.server.getCustomBossEvents().onPlayerDisconnect(entityplayer); UUID uuid = entityplayer.getUUID(); -@@ -775,6 +780,7 @@ public abstract class PlayerList { +@@ -781,6 +786,7 @@ public abstract class PlayerList { // Paper end entityplayer.stopRiding(); // CraftBukkit this.players.remove(entityplayer); @@ -86,7 +86,7 @@ index ede2eb274ca715dccfbfd98e0e2c410990508ced..d2fc479811087a7536fbe1226ae2efa0 this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot entityplayer.getLevel().removePlayerImmediately(entityplayer, Entity.RemovalReason.DISCARDED); BlockPos blockposition = entityplayer.getRespawnPosition(); -@@ -912,6 +918,7 @@ public abstract class PlayerList { +@@ -918,6 +924,7 @@ public abstract class PlayerList { if (!entityplayer.connection.isDisconnected()) { worldserver1.addRespawnedPlayer(entityplayer1); this.players.add(entityplayer1); @@ -94,7 +94,7 @@ index ede2eb274ca715dccfbfd98e0e2c410990508ced..d2fc479811087a7536fbe1226ae2efa0 this.playersByName.put(entityplayer1.getScoreboardName().toLowerCase(java.util.Locale.ROOT), entityplayer1); // Spigot this.playersByUUID.put(entityplayer1.getUUID(), entityplayer1); } -@@ -962,20 +969,55 @@ public abstract class PlayerList { +@@ -968,20 +975,55 @@ public abstract class PlayerList { this.sendPlayerPermissionLevel(player, i); } diff --git a/patches/server/0108-Optimize-player-list-for-sending-player-info.patch b/patches/server/0109-Optimize-player-list-for-sending-player-info.patch similarity index 95% rename from patches/server/0108-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0109-Optimize-player-list-for-sending-player-info.patch index c4e119a..228c750 100644 --- a/patches/server/0108-Optimize-player-list-for-sending-player-info.patch +++ b/patches/server/0109-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 d2fc479811087a7536fbe1226ae2efa02ca700db..b34d64de19f387b4a95cc24b57aa98f81c4f2a9c 100644 +index 7ff8d687818dd8f5a822f49f8c612b7833eafc4d..4e5d6895d4be71bafa100a1b8324bc3ec8ebbc83 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -1005,14 +1005,18 @@ public abstract class PlayerList { +@@ -1011,14 +1011,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/0109-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0110-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0109-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0110-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0110-Send-multiple-keep-alive-packets.patch b/patches/server/0111-Send-multiple-keep-alive-packets.patch similarity index 98% rename from patches/server/0110-Send-multiple-keep-alive-packets.patch rename to patches/server/0111-Send-multiple-keep-alive-packets.patch index b13bd2c..c84fa3b 100644 --- a/patches/server/0110-Send-multiple-keep-alive-packets.patch +++ b/patches/server/0111-Send-multiple-keep-alive-packets.patch @@ -109,7 +109,7 @@ index 60e2b951216003ae1861b1ee218e38da107b1760..315c7737f75c426a7e5c091fb340187d if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) { int i = (int) (Util.getMillis() - this.keepAliveTime); diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -index 2d8d042112db908d76da023329f16402791029aa..d87db127a13c37cd4d9e0ff2f0a5b5387c5fbb0b 100644 +index 58f9d024f5a17c2d28d89f740e04f638fe3a2a92..e87d93e364eccc4dde3c00d34df6d63fae597b25 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java @@ -77,6 +77,13 @@ public class GaleGlobalConfiguration extends ConfigurationPart { diff --git a/patches/server/0111-Make-slow-login-timeout-configurable.patch b/patches/server/0112-Make-slow-login-timeout-configurable.patch similarity index 96% rename from patches/server/0111-Make-slow-login-timeout-configurable.patch rename to patches/server/0112-Make-slow-login-timeout-configurable.patch index 5baef54..b4b925d 100644 --- a/patches/server/0111-Make-slow-login-timeout-configurable.patch +++ b/patches/server/0112-Make-slow-login-timeout-configurable.patch @@ -31,7 +31,7 @@ index 2ed3f42b1e487374287d033ac634a922a5ef37bd..af96c170c58553f4ce0554c9bd24fea2 } diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -index d87db127a13c37cd4d9e0ff2f0a5b5387c5fbb0b..dcbd9b09ffbadaf0af13814c7da1e8b8899b9695 100644 +index e87d93e364eccc4dde3c00d34df6d63fae597b25..d0ca76c0087e7cf309a452f50888dc0ef419ed53 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java @@ -42,6 +42,20 @@ public class GaleGlobalConfiguration extends ConfigurationPart { diff --git a/patches/server/0112-Make-max-interaction-distance-configurable.patch b/patches/server/0113-Make-max-interaction-distance-configurable.patch similarity index 100% rename from patches/server/0112-Make-max-interaction-distance-configurable.patch rename to patches/server/0113-Make-max-interaction-distance-configurable.patch diff --git a/patches/server/0113-Load-portal-destination-chunk-before-entity-teleport.patch b/patches/server/0114-Load-portal-destination-chunk-before-entity-teleport.patch similarity index 100% rename from patches/server/0113-Load-portal-destination-chunk-before-entity-teleport.patch rename to patches/server/0114-Load-portal-destination-chunk-before-entity-teleport.patch diff --git a/patches/server/0114-Don-t-load-chunks-to-spawn-phantoms.patch b/patches/server/0115-Don-t-load-chunks-to-spawn-phantoms.patch similarity index 100% rename from patches/server/0114-Don-t-load-chunks-to-spawn-phantoms.patch rename to patches/server/0115-Don-t-load-chunks-to-spawn-phantoms.patch diff --git a/patches/server/0115-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0116-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 100% rename from patches/server/0115-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0116-Don-t-load-chunks-to-activate-climbing-entities.patch diff --git a/patches/server/0116-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0117-Broadcast-crit-animations-as-the-entity-being-critte.patch similarity index 100% rename from patches/server/0116-Broadcast-crit-animations-as-the-entity-being-critte.patch rename to patches/server/0117-Broadcast-crit-animations-as-the-entity-being-critte.patch diff --git a/patches/server/0117-Ignore-null-legacy-structure-data.patch b/patches/server/0118-Ignore-null-legacy-structure-data.patch similarity index 97% rename from patches/server/0117-Ignore-null-legacy-structure-data.patch rename to patches/server/0118-Ignore-null-legacy-structure-data.patch index 7edbc8d..6a85e55 100644 --- a/patches/server/0117-Ignore-null-legacy-structure-data.patch +++ b/patches/server/0118-Ignore-null-legacy-structure-data.patch @@ -46,7 +46,7 @@ index 3b2df0411f9ef85445a53292a65f805a80218979..99126888d4ccae266e55ed3d9ed858fb continue; } diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -index dcbd9b09ffbadaf0af13814c7da1e8b8899b9695..9c7a781240c0cdfee142f788ca73de6805ede02b 100644 +index d0ca76c0087e7cf309a452f50888dc0ef419ed53..75f3ca0b8fed2fbc9219045d2b28999d0a592064 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java @@ -56,6 +56,19 @@ public class GaleGlobalConfiguration extends ConfigurationPart { diff --git a/patches/server/0118-Don-t-double-save-stored-user-lists.patch b/patches/server/0119-Don-t-double-save-stored-user-lists.patch similarity index 100% rename from patches/server/0118-Don-t-double-save-stored-user-lists.patch rename to patches/server/0119-Don-t-double-save-stored-user-lists.patch diff --git a/patches/server/0119-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0120-Skip-unnecessary-mob-spawning-computations.patch similarity index 100% rename from patches/server/0119-Skip-unnecessary-mob-spawning-computations.patch rename to patches/server/0120-Skip-unnecessary-mob-spawning-computations.patch diff --git a/patches/server/0120-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0121-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 100% rename from patches/server/0120-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to patches/server/0121-Prevent-entities-random-strolling-into-non-ticking-c.patch diff --git a/patches/server/0121-Do-not-place-player-in-world-if-kicked-before-being-.patch b/patches/server/0122-Do-not-place-player-in-world-if-kicked-before-being-.patch similarity index 94% rename from patches/server/0121-Do-not-place-player-in-world-if-kicked-before-being-.patch rename to patches/server/0122-Do-not-place-player-in-world-if-kicked-before-being-.patch index 54b25b4..46ddf22 100644 --- a/patches/server/0121-Do-not-place-player-in-world-if-kicked-before-being-.patch +++ b/patches/server/0122-Do-not-place-player-in-world-if-kicked-before-being-.patch @@ -14,7 +14,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index b34d64de19f387b4a95cc24b57aa98f81c4f2a9c..d18bef8b90e786929e58afe6d7fd7ad1468cf6e0 100644 +index 4e5d6895d4be71bafa100a1b8324bc3ec8ebbc83..1561ea392ce6fb35a01e407cb6fddab0c1942a1c 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -253,6 +253,13 @@ public abstract class PlayerList { diff --git a/patches/server/0122-CraftBukkit-UUID-to-world-map.patch b/patches/server/0123-CraftBukkit-UUID-to-world-map.patch similarity index 100% rename from patches/server/0122-CraftBukkit-UUID-to-world-map.patch rename to patches/server/0123-CraftBukkit-UUID-to-world-map.patch diff --git a/patches/server/0123-Specific-interval-TPS-API.patch b/patches/server/0124-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0123-Specific-interval-TPS-API.patch rename to patches/server/0124-Specific-interval-TPS-API.patch diff --git a/patches/server/0124-5-second-TPS-average.patch b/patches/server/0125-5-second-TPS-average.patch similarity index 100% rename from patches/server/0124-5-second-TPS-average.patch rename to patches/server/0125-5-second-TPS-average.patch diff --git a/patches/server/0125-Measure-last-tick-time.patch b/patches/server/0126-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0125-Measure-last-tick-time.patch rename to patches/server/0126-Measure-last-tick-time.patch diff --git a/patches/server/0126-Last-tick-time-API.patch b/patches/server/0127-Last-tick-time-API.patch similarity index 100% rename from patches/server/0126-Last-tick-time-API.patch rename to patches/server/0127-Last-tick-time-API.patch diff --git a/patches/server/0127-Show-last-tick-time-in-tps-command.patch b/patches/server/0128-Show-last-tick-time-in-tps-command.patch similarity index 98% rename from patches/server/0127-Show-last-tick-time-in-tps-command.patch rename to patches/server/0128-Show-last-tick-time-in-tps-command.patch index c358f69..f4605f7 100644 --- a/patches/server/0127-Show-last-tick-time-in-tps-command.patch +++ b/patches/server/0128-Show-last-tick-time-in-tps-command.patch @@ -23,7 +23,7 @@ The above copyright notice and this permission notice shall be included in all c THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -index 9c7a781240c0cdfee142f788ca73de6805ede02b..aab6c3dc79bd86e70c43ada8e3a8d073c16571ae 100644 +index 75f3ca0b8fed2fbc9219045d2b28999d0a592064..c530e10f0de3dee69949e1752f0b27180d9b2fe5 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java @@ -111,6 +111,14 @@ public class GaleGlobalConfiguration extends ConfigurationPart { diff --git a/patches/server/0128-Increase-time-statistics-in-intervals.patch b/patches/server/0129-Increase-time-statistics-in-intervals.patch similarity index 98% rename from patches/server/0128-Increase-time-statistics-in-intervals.patch rename to patches/server/0129-Increase-time-statistics-in-intervals.patch index 5c05793..0d4dcd7 100644 --- a/patches/server/0128-Increase-time-statistics-in-intervals.patch +++ b/patches/server/0129-Increase-time-statistics-in-intervals.patch @@ -87,7 +87,7 @@ index 68247b9daf710c71f84e1fae9d91efed151d39aa..92b30f5293e80e078d8a1a740d22367e int i = 29999999; diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -index aab6c3dc79bd86e70c43ada8e3a8d073c16571ae..5cd1c4d360b879cfaf706f39b9c7127923241413 100644 +index c530e10f0de3dee69949e1752f0b27180d9b2fe5..a7f1be75344f5f4d20d7561704a20a90a7db8a66 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java @@ -27,7 +27,29 @@ public class GaleGlobalConfiguration extends ConfigurationPart { diff --git a/patches/server/0129-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0130-For-collision-check-has-physics-before-same-vehicle.patch similarity index 100% rename from patches/server/0129-For-collision-check-has-physics-before-same-vehicle.patch rename to patches/server/0130-For-collision-check-has-physics-before-same-vehicle.patch diff --git a/patches/server/0130-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0131-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from patches/server/0130-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0131-Skip-negligible-planar-movement-multiplication.patch diff --git a/patches/server/0131-Optimize-identical-item-checks.patch b/patches/server/0132-Optimize-identical-item-checks.patch similarity index 100% rename from patches/server/0131-Optimize-identical-item-checks.patch rename to patches/server/0132-Optimize-identical-item-checks.patch diff --git a/patches/server/0132-Reduce-RandomSource-instances.patch b/patches/server/0133-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0132-Reduce-RandomSource-instances.patch rename to patches/server/0133-Reduce-RandomSource-instances.patch diff --git a/patches/server/0133-Server-thread-priority-environment-variable.patch b/patches/server/0134-Server-thread-priority-environment-variable.patch similarity index 100% rename from patches/server/0133-Server-thread-priority-environment-variable.patch rename to patches/server/0134-Server-thread-priority-environment-variable.patch diff --git a/patches/server/0134-Thread-safety-annotations.patch b/patches/server/0135-Thread-safety-annotations.patch similarity index 100% rename from patches/server/0134-Thread-safety-annotations.patch rename to patches/server/0135-Thread-safety-annotations.patch diff --git a/patches/server/0135-CPU-cores-estimation.patch b/patches/server/0136-CPU-cores-estimation.patch similarity index 97% rename from patches/server/0135-CPU-cores-estimation.patch rename to patches/server/0136-CPU-cores-estimation.patch index 0213869..b8b3f9a 100644 --- a/patches/server/0135-CPU-cores-estimation.patch +++ b/patches/server/0136-CPU-cores-estimation.patch @@ -68,13 +68,13 @@ index b9a799997e3475117ab91d7f3edb5f2f243a9f6b..e23fdd5ba09b50b7eef0ca4f36c54807 import org.yaml.snakeyaml.constructor.SafeConstructor; import org.yaml.snakeyaml.error.MarkedYAMLException; diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -index 5cd1c4d360b879cfaf706f39b9c7127923241413..45df85b2b7cf715422697d330971ff71ca585813 100644 +index a7f1be75344f5f4d20d7561704a20a90a7db8a66..1452704bc21ca859261169431d2d36a90d5f1e3f 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -@@ -152,6 +152,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart { - public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks +@@ -153,6 +153,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart { public boolean unrecognizedRecipes = false; // Gale - Purpur - do not log unrecognized recipes public boolean legacyMaterialInitialization = false; // Gale - Purpur - do not log legacy Material initialization + public boolean playerLoginLocations = true; // Gale - JettPack - make logging login location configurable + public boolean cpuCoresEstimation = true; // Gale - CPU cores estimation public Chat chat; diff --git a/patches/server/0136-Mutex-utility.patch b/patches/server/0137-Mutex-utility.patch similarity index 100% rename from patches/server/0136-Mutex-utility.patch rename to patches/server/0137-Mutex-utility.patch diff --git a/patches/server/0137-Paired-lock-and-condition-utility.patch b/patches/server/0138-Paired-lock-and-condition-utility.patch similarity index 100% rename from patches/server/0137-Paired-lock-and-condition-utility.patch rename to patches/server/0138-Paired-lock-and-condition-utility.patch diff --git a/patches/server/0138-Unterminable-executor-utility.patch b/patches/server/0139-Unterminable-executor-utility.patch similarity index 100% rename from patches/server/0138-Unterminable-executor-utility.patch rename to patches/server/0139-Unterminable-executor-utility.patch diff --git a/patches/server/0139-FIFO-concurrent-queue-utility.patch b/patches/server/0140-FIFO-concurrent-queue-utility.patch similarity index 100% rename from patches/server/0139-FIFO-concurrent-queue-utility.patch rename to patches/server/0140-FIFO-concurrent-queue-utility.patch diff --git a/patches/server/0140-Base-thread-pools.patch b/patches/server/0141-Base-thread-pools.patch similarity index 99% rename from patches/server/0140-Base-thread-pools.patch rename to patches/server/0141-Base-thread-pools.patch index bfe1b27..4a8fb03 100644 --- a/patches/server/0140-Base-thread-pools.patch +++ b/patches/server/0141-Base-thread-pools.patch @@ -1562,7 +1562,7 @@ index 4b3d2280326c7eeda4952c36edff141cbff90e16..fa3a58f09178604e301b107f1a029e59 private static URL getEndpoint(URI root, @Nullable JsonObject endpoints, String key, String fallback) throws MalformedURLException { diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index d18bef8b90e786929e58afe6d7fd7ad1468cf6e0..7249935d895189d2dbf629507590fd084564c7a6 100644 +index 1561ea392ce6fb35a01e407cb6fddab0c1942a1c..fe87ef6e0540bf81518fa01ca2c3516c95c2fb53 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -15,7 +15,6 @@ import java.net.SocketAddress; @@ -1653,7 +1653,7 @@ index d18bef8b90e786929e58afe6d7fd7ad1468cf6e0..7249935d895189d2dbf629507590fd08 MutableComponent ichatmutablecomponent; if (player.getGameProfile().getName().equalsIgnoreCase(s)) { -@@ -1501,10 +1552,8 @@ public abstract class PlayerList { +@@ -1507,10 +1558,8 @@ public abstract class PlayerList { public void setViewDistance(int viewDistance) { this.viewDistance = viewDistance; //this.broadcastAll(new ClientboundSetChunkCacheRadiusPacket(viewDistance)); // Paper - move into setViewDistance @@ -1665,7 +1665,7 @@ index d18bef8b90e786929e58afe6d7fd7ad1468cf6e0..7249935d895189d2dbf629507590fd08 if (worldserver != null) { worldserver.getChunkSource().setViewDistance(viewDistance); -@@ -1516,10 +1565,8 @@ public abstract class PlayerList { +@@ -1522,10 +1571,8 @@ public abstract class PlayerList { public void setSimulationDistance(int simulationDistance) { this.simulationDistance = simulationDistance; //this.broadcastAll(new ClientboundSetSimulationDistancePacket(simulationDistance)); // Paper - handled by playerchunkloader @@ -1908,7 +1908,7 @@ index 69acbab61a79c24312359a63086f9353d740113f..49ace73d901b6f55545bb21a93d026a0 } } catch (Exception ex) { diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -index 45df85b2b7cf715422697d330971ff71ca585813..f5adad65a312df55fbbbe191c8919767c4dde3fb 100644 +index 1452704bc21ca859261169431d2d36a90d5f1e3f..3919608d32c0d528a7e54e66c4f95f3175504b92 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java @@ -2,11 +2,14 @@ diff --git a/patches/server/0141-Non-blocking-PooledObjects.patch b/patches/server/0142-Non-blocking-PooledObjects.patch similarity index 100% rename from patches/server/0141-Non-blocking-PooledObjects.patch rename to patches/server/0142-Non-blocking-PooledObjects.patch