diff --git a/gradle.properties b/gradle.properties index a0e8653f..a98f5611 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = cn.dreeam.leaf mcVersion = 1.21.1 version = 1.21.1-R0.1-SNAPSHOT -galeCommit = 7f08ee6661835ace633849f51004a7e932a06a60 +galeCommit = c8d1f9bc50bd0992e974035a605f2a815cebb5e6 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/api/0001-Rebrand.patch b/patches/api/0001-Rebrand.patch index 21146175..83ae4e06 100644 --- a/patches/api/0001-Rebrand.patch +++ b/patches/api/0001-Rebrand.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Rebrand diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java -index bdc8d830f54e4567ec0b03041221fdcd016ce76c..25ad7e9a9aa11049ad6ce2d2c829d3e75f8886c2 100644 +index b68770f6992b044d13e67d9affa6933c90ca8fb8..cbe3a265e3c3ec2c06c79e5146c52bc6cea5a653 100644 --- a/src/main/java/io/papermc/paper/ServerBuildInfo.java +++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java -@@ -25,6 +25,17 @@ public interface ServerBuildInfo { +@@ -26,6 +26,17 @@ public interface ServerBuildInfo { Key BRAND_GALE_ID = Key.key("galemc", "gale"); // Gale end - branding changes diff --git a/patches/api/0004-Purpur-API-Changes.patch b/patches/api/0004-Purpur-API-Changes.patch index e7e33529..f21e5312 100644 --- a/patches/api/0004-Purpur-API-Changes.patch +++ b/patches/api/0004-Purpur-API-Changes.patch @@ -17,10 +17,10 @@ Remove-Timings.patch Add-log-suppression-for-LibraryLoader.patch diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java -index 25ad7e9a9aa11049ad6ce2d2c829d3e75f8886c2..0cafbbcb8fe294bcd84b93da8fba96368971dffd 100644 +index cbe3a265e3c3ec2c06c79e5146c52bc6cea5a653..f3e30fa999860bbca4fc9c0c1197e1d3bd107a81 100644 --- a/src/main/java/io/papermc/paper/ServerBuildInfo.java +++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java -@@ -25,6 +25,13 @@ public interface ServerBuildInfo { +@@ -26,6 +26,13 @@ public interface ServerBuildInfo { Key BRAND_GALE_ID = Key.key("galemc", "gale"); // Gale end - branding changes diff --git a/patches/server/0015-Remove-Timings.patch b/patches/server/0015-Remove-Timings.patch index 442b2d1b..ec6946fa 100644 --- a/patches/server/0015-Remove-Timings.patch +++ b/patches/server/0015-Remove-Timings.patch @@ -742,7 +742,7 @@ index 0c3c82b28e581286b798ee58ca4193efc2faff4a..5a2a4f69995f23e799370c05f28f9353 // return true as command was handled return 1; diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -index 690086adcb1f87adc0b3ab664fde735ad3e1093a..97af7a985085e868cb21f91361e26327e1d4c108 100644 +index a9dd0e5216e95afd98fd2200d110e2cc0b1b0dca..3d63471c6566d4e69b4e0f2f7c334cf3a33818b9 100644 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java @@ -1,6 +1,5 @@ @@ -1155,7 +1155,7 @@ index e8a89db44ed4f20516a9716bc3f41658f63a312c..74bf36f75b59b1e21b72afcf65344786 } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index b044de2a7af189e4ee4c8d72212fb8b7612f8a3a..20f1069230fcef4a00deec4c0ae6fdc64041630a 100644 +index d2cbf34389a1b56c442c6ce08f55f1174a9d9f0b..70b247cd559cb9814fbf8e3ab7839a40488dbef1 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1,7 +1,6 @@ @@ -1325,7 +1325,7 @@ index b044de2a7af189e4ee4c8d72212fb8b7612f8a3a..20f1069230fcef4a00deec4c0ae6fdc6 } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index f93ef54bbb02d0749a42aeebf8425472804cd213..63678ff4e0948c7c67e092f446e0bfa358695887 100644 +index b2c3ef601df19c00d3a8a24c4be281ccc1fdb007..90d8d4e2b46ae8a29557dfedbeba1cfb9117dcfe 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1,6 +1,5 @@ @@ -1335,7 +1335,7 @@ index f93ef54bbb02d0749a42aeebf8425472804cd213..63678ff4e0948c7c67e092f446e0bfa3 import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -@@ -1299,7 +1298,6 @@ public abstract class PlayerList { +@@ -1300,7 +1299,6 @@ public abstract class PlayerList { public void saveAll(int interval) { io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main @@ -1343,7 +1343,7 @@ index f93ef54bbb02d0749a42aeebf8425472804cd213..63678ff4e0948c7c67e092f446e0bfa3 int numSaved = 0; long now = MinecraftServer.currentTick; for (int i = 0; i < this.players.size(); ++i) { -@@ -1310,7 +1308,6 @@ public abstract class PlayerList { +@@ -1311,7 +1309,6 @@ public abstract class PlayerList { } // Paper end - Incremental chunk and player saving } @@ -1492,7 +1492,7 @@ index 85b4b24361e785acf75571ff98f924c00ae80748..ac67dd7a30616fe70f73426e332972b7 } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 3cb6faa071c6a743a845bc358ea411a165c4024b..24ed26286c7e3e45279b6b27cd0a432b37fda4b2 100644 +index f00e11d9be2f95aecaecd7f69dbad9ad70193ab4..79360f7494c5f83b49d054ba65495d8db354d35d 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -177,7 +177,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl diff --git a/patches/server/0033-Leaves-Xaero-Map-Protocol.patch b/patches/server/0033-Leaves-Xaero-Map-Protocol.patch index 720e9895..4da44eac 100644 --- a/patches/server/0033-Leaves-Xaero-Map-Protocol.patch +++ b/patches/server/0033-Leaves-Xaero-Map-Protocol.patch @@ -9,10 +9,10 @@ Original project: https://github.com/LeavesMC/Leaves This patch is Powered by Xaero Map diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 73b69eb3b986cad3fee4bbf381833a363600ec64..345dba02d52478d4c2c045936fce5e4e9982b942 100644 +index 70bdd37ba326fc2a74dc273784fd11261e180372..df9f87ff656dbc80f934f35ff45e6de5905f7b7e 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -1338,6 +1338,7 @@ public abstract class PlayerList { +@@ -1339,6 +1339,7 @@ public abstract class PlayerList { player.connection.send(new ClientboundInitializeBorderPacket(worldborder)); player.connection.send(new ClientboundSetTimePacket(world.getGameTime(), world.getDayTime(), world.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT))); player.connection.send(new ClientboundSetDefaultSpawnPositionPacket(world.getSharedSpawnPos(), world.getSharedSpawnAngle())); diff --git a/patches/server/0062-Remove-useless-creating-stats-json-bases-on-player-n.patch b/patches/server/0062-Remove-useless-creating-stats-json-bases-on-player-n.patch index 1dc68385..92020111 100644 --- a/patches/server/0062-Remove-useless-creating-stats-json-bases-on-player-n.patch +++ b/patches/server/0062-Remove-useless-creating-stats-json-bases-on-player-n.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove useless creating stats json bases on player name logic diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 2d502a956084ccab08342f98a91d03e5b01b19dd..f073b87e6b214e08672980f8f229cd436a742def 100644 +index 509cf388b501fc446dc9bcd8e79bd7018ef33180..e562e401f4548fd5ec0968e3eab06c65348d3ddd 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -1687,6 +1687,8 @@ public abstract class PlayerList { +@@ -1688,6 +1688,8 @@ public abstract class PlayerList { File file = this.server.getWorldPath(LevelResource.PLAYER_STATS_DIR).toFile(); File file1 = new File(file, String.valueOf(uuid) + ".json"); @@ -17,7 +17,7 @@ index 2d502a956084ccab08342f98a91d03e5b01b19dd..f073b87e6b214e08672980f8f229cd43 if (!file1.exists()) { File file2 = new File(file, displayName + ".json"); // CraftBukkit Path path = file2.toPath(); -@@ -1695,6 +1697,8 @@ public abstract class PlayerList { +@@ -1696,6 +1698,8 @@ public abstract class PlayerList { file2.renameTo(file1); } } diff --git a/patches/server/0067-Mirai-Configurable-chat-message-signatures.patch b/patches/server/0067-Mirai-Configurable-chat-message-signatures.patch index f07121ba..23b4a033 100644 --- a/patches/server/0067-Mirai-Configurable-chat-message-signatures.patch +++ b/patches/server/0067-Mirai-Configurable-chat-message-signatures.patch @@ -130,10 +130,10 @@ index 648a342c309c12dedf7d70b88163f80fb72150cf..b8b2914543f4bfe71a9734e3d848fba0 if (packet == null || this.processedDisconnect) { // Spigot return; diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 5d81f06c981128e4199555c1378345dccf4682b2..4ec44f3b5f58f8e21fe5224167e1178fb55770f8 100644 +index 4f1d226bc7c5eea06e837e99f268827ca94e221f..34b70d75295c4c7551ddd3569e3961d80e679a46 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -1641,7 +1641,7 @@ public abstract class PlayerList { +@@ -1642,7 +1642,7 @@ public abstract class PlayerList { // Paper end boolean flag = this.verifyChatTrusted(message); @@ -142,7 +142,7 @@ index 5d81f06c981128e4199555c1378345dccf4682b2..4ec44f3b5f58f8e21fe5224167e1178f OutgoingChatMessage outgoingchatmessage = OutgoingChatMessage.create(message); boolean flag1 = false; -@@ -1670,6 +1670,7 @@ public abstract class PlayerList { +@@ -1671,6 +1671,7 @@ public abstract class PlayerList { } public boolean verifyChatTrusted(PlayerChatMessage message) { // Paper - private -> public diff --git a/patches/server/0078-Configurable-connection-message.patch b/patches/server/0078-Configurable-connection-message.patch index 4440e7c1..94e8d3f3 100644 --- a/patches/server/0078-Configurable-connection-message.patch +++ b/patches/server/0078-Configurable-connection-message.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable connection message diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index de30155875f1c279a35dc7e0506f69b1b583b1f6..b58d4699b4496658934ad9cd713aec9a000dd08e 100644 +index 34b70d75295c4c7551ddd3569e3961d80e679a46..2614933317f102a0f559374d2bb8efc70b230e85 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -455,7 +455,7 @@ public abstract class PlayerList { @@ -35,7 +35,7 @@ index de30155875f1c279a35dc7e0506f69b1b583b1f6..b58d4699b4496658934ad9cd713aec9a this.cserver.getPluginManager().callEvent(playerQuitEvent); entityplayer.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage()); -@@ -1814,4 +1814,29 @@ public abstract class PlayerList { +@@ -1815,4 +1815,29 @@ public abstract class PlayerList { public boolean isAllowCommandsForAllPlayers() { return this.allowCommandsForAllPlayers; }