diff --git a/build.gradle.kts b/build.gradle.kts index f6f204c3b..3794af36b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { java `maven-publish` id("com.github.johnrengelman.shadow") version "7.1.2" apply false - id("io.papermc.paperweight.patcher") version "1.3.5" + id("io.papermc.paperweight.patcher") version "1.3.6" } repositories { @@ -17,7 +17,7 @@ repositories { } dependencies { - remapper("net.fabricmc:tiny-remapper:0.8.1:fat") + remapper("net.fabricmc:tiny-remapper:0.8.2:fat") decompiler("net.minecraftforge:forgeflower:1.5.498.29") paperclip("io.papermc:paperclip:3.0.2") } diff --git a/gradle.properties b/gradle.properties index c7a39b662..9cefa7558 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.18.2-R0.1-SNAPSHOT -paperCommit = 6f5e6c60d397058d89892862bd194773d1695315 +paperCommit = e5da93a6083218421bd4e4c6e9bf7a2492bd70ff org.gradle.caching = true org.gradle.parallel = true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2..41d9927a4 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb8790..aa991fcea 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/patches/server/0018-Player-invulnerabilities.patch b/patches/server/0018-Player-invulnerabilities.patch index 760d0b976..054550f27 100644 --- a/patches/server/0018-Player-invulnerabilities.patch +++ b/patches/server/0018-Player-invulnerabilities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 38c2e2b4e6577dd6db84b86147a6f0c5bd0b8879..c03f9ed7dfb53041d37de950b2ec734bde614d0e 100644 +index 11ad98d35e33ba2465876c222288d047ab5189f1..3c42c1d0c9542f8ce058cd2bfc931f53ad0a82e8 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -254,6 +254,7 @@ public class ServerPlayer extends Player { @@ -62,7 +62,7 @@ index 38c2e2b4e6577dd6db84b86147a6f0c5bd0b8879..c03f9ed7dfb53041d37de950b2ec734b this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt)); } -@@ -2473,9 +2483,17 @@ public class ServerPlayer extends Player { +@@ -2474,9 +2484,17 @@ public class ServerPlayer extends Player { @Override public boolean isImmobile() { @@ -108,7 +108,7 @@ index 1d61e34b1cc032089dbd715814553e59ebc8ce5c..763874b78363d75f8c386cff3cf48c93 this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit // Paper end diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index e4e0db7d94ab7c86f3bdd8be17f85d6ea403b313..b9438bfd5f0949995d64e7c2ca0acd43f13fec76 100644 +index 631472b43ac25337a05184d096e7bc97f47ce9e6..2606c339f5c24e9f73c6270669fb3d2ac4d41c1c 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1004,6 +1004,8 @@ public abstract class PlayerList { @@ -121,7 +121,7 @@ index e4e0db7d94ab7c86f3bdd8be17f85d6ea403b313..b9438bfd5f0949995d64e7c2ca0acd43 return entityplayer1; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index e9c3768ef277fc88db4d5660e241ec7ef8e770c4..4f007dce3f4f7cf19d8e38b46435c762813c6c43 100644 +index e7d454da116261f24341391e6933aaedd26a4a18..29e12552745000fbfa1cee6668a5bf039f918f6f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2817,5 +2817,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0076-Implement-respawn-anchor-explosion-options.patch b/patches/server/0076-Implement-respawn-anchor-explosion-options.patch index f734c050f..ac106e10e 100644 --- a/patches/server/0076-Implement-respawn-anchor-explosion-options.patch +++ b/patches/server/0076-Implement-respawn-anchor-explosion-options.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Implement respawn anchor explosion options diff --git a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java -index 07e893f1859abe3c2a765694c21309d60346ca82..0fabe3ec1e9d7dae952db1f1e3dd3af879f0bc54 100644 +index 3770313892b6e9b9ab6f9fcc200dfc0b4972e516..c763b9eb6ca981f89f0868408273d78146a42748 100644 --- a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java +++ b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java -@@ -120,7 +120,7 @@ public class RespawnAnchorBlock extends Block { +@@ -125,7 +125,7 @@ public class RespawnAnchorBlock extends Block { return pos.equals(explodedPos) && bl2 ? Optional.of(Blocks.WATER.getExplosionResistance()) : super.getBlockExplosionResistance(explosion, world, pos, blockState, fluidState); } }; @@ -18,7 +18,7 @@ index 07e893f1859abe3c2a765694c21309d60346ca82..0fabe3ec1e9d7dae952db1f1e3dd3af8 public static boolean canSetSpawn(Level world) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index f4588e514e60bb244c789b162b8503c236950a3b..a38a4bdba8c87bfce09487714b58082f74432b9d 100644 +index 300404c79b0f47219e3a641f75a935cbac9d194a..d6f6cf7e17d9cd5b1398aab8e2b9b6df75fea02e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -324,6 +324,22 @@ public class PurpurWorldConfig { diff --git a/patches/server/0080-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0080-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch index 0caf6a0f5..b0d28332f 100644 --- a/patches/server/0080-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch +++ b/patches/server/0080-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 1a85642f17e84efa2b2484990fcedf91fbbc281d..10806ceb46832aa80ffaa1df45c7ec0d1c112dd7 100644 +index 54c6433daec4574fd1653a73fa80761ddf49549e..697b48d1234c8faa426c7dc67bd0fcc2a9cbd696 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2543,4 +2543,26 @@ public class ServerPlayer extends Player { +@@ -2544,4 +2544,26 @@ public class ServerPlayer extends Player { // CraftBukkit end public final int getViewDistance() { throw new UnsupportedOperationException("Use PlayerChunkLoader"); } // Paper - placeholder @@ -36,7 +36,7 @@ index 1a85642f17e84efa2b2484990fcedf91fbbc281d..10806ceb46832aa80ffaa1df45c7ec0d + // Purpur end } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 0ff49c290f5294e6986d9c2088e441f0ec96ff22..ccecf12fa8c5a498f8a7ced421e1084c8f04c194 100644 +index a50035eae2faec356bb8cc3956ae39618f8dace2..36008beb94e69ddfa37c7610c7f8174b21157f45 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -45,6 +45,7 @@ import net.minecraft.network.syncher.EntityDataAccessor; diff --git a/patches/server/0127-Implement-TPSBar.patch b/patches/server/0127-Implement-TPSBar.patch index 1e7318aa6..e8cc2a286 100644 --- a/patches/server/0127-Implement-TPSBar.patch +++ b/patches/server/0127-Implement-TPSBar.patch @@ -29,7 +29,7 @@ index b15647b6cf2495b15a994ab32a4d53cb3890d9b6..38eee8b34caaee7fb4e05dd08b1854af this.hasLoggedStop = true; // Paper if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 0df8172bc3a5621c2d23b036ce2e5879650757b5..d185dfc8194aad9ed7d1a55817bb4c52834527f2 100644 +index a4a07a7cc9a33f01234e461aa3c19e1c2e4d6aef..f508eda7f689ef1a5743bda4d68a863f37108486 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -361,6 +361,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -41,7 +41,7 @@ index 0df8172bc3a5621c2d23b036ce2e5879650757b5..d185dfc8194aad9ed7d1a55817bb4c52 } } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index b5beb009479ad743be64ae48b278d0864e163ed4..152d4f5be6ec00e3a38aeeaf89fbfddfafdc21c3 100644 +index a2ee560ad8411fbc185df1a7e96d66ebfef3fe0b..e070c4dc4f8583b7d5c10b353c5e21304add0233 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -255,6 +255,7 @@ public class ServerPlayer extends Player { @@ -68,7 +68,7 @@ index b5beb009479ad743be64ae48b278d0864e163ed4..152d4f5be6ec00e3a38aeeaf89fbfddf } // CraftBukkit start - World fallback code, either respawn location or global spawn -@@ -2573,5 +2576,13 @@ public class ServerPlayer extends Player { +@@ -2574,5 +2577,13 @@ public class ServerPlayer extends Player { this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig.disableTeleportationSuffocationCheck); } } @@ -83,7 +83,7 @@ index b5beb009479ad743be64ae48b278d0864e163ed4..152d4f5be6ec00e3a38aeeaf89fbfddf // Purpur end } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 441599f0078f99498aa409d500518366be18bade..631c7d050aad2ffc58ac2066168502d2485c8673 100644 +index 115c31f1a5d397aa981ba3b52d7d0fe92b236a02..0696d4d740243a535bab8e9b37beb2c98944031d 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -493,6 +493,7 @@ public abstract class PlayerList { diff --git a/patches/server/0190-Add-toggle-for-sand-duping-fix.patch b/patches/server/0190-Add-toggle-for-sand-duping-fix.patch index ae0959912..b4909a9b4 100644 --- a/patches/server/0190-Add-toggle-for-sand-duping-fix.patch +++ b/patches/server/0190-Add-toggle-for-sand-duping-fix.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for sand duping fix diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java -index e234373432f34f237f884f7054c0d80829228522..22916618d5b5096802410a174c9a593d6a3a1121 100644 +index 46102c28d10b11ecbafd3dda2de66982eaed8a00..fa88207befcee5e95c86479af1f8923eeeb0bce9 100644 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java -@@ -121,7 +121,7 @@ public class FallingBlockEntity extends Entity { +@@ -127,7 +127,7 @@ public class FallingBlockEntity extends Entity { @Override public void tick() { // Paper start - fix sand duping @@ -17,7 +17,7 @@ index e234373432f34f237f884f7054c0d80829228522..22916618d5b5096802410a174c9a593d return; } // Paper end - fix sand duping -@@ -138,7 +138,7 @@ public class FallingBlockEntity extends Entity { +@@ -144,7 +144,7 @@ public class FallingBlockEntity extends Entity { this.move(MoverType.SELF, this.getDeltaMovement()); // Paper start - fix sand duping diff --git a/patches/server/0214-Add-compass-command.patch b/patches/server/0214-Add-compass-command.patch index ba3bcdd8e..752336156 100644 --- a/patches/server/0214-Add-compass-command.patch +++ b/patches/server/0214-Add-compass-command.patch @@ -17,7 +17,7 @@ index 9e7cc8bf867b6e4f86b55e1f1d3a1cb6233c90f1..7c30d8d61a8e82d8a1f61451090e9bbb if (environment.includeIntegrated) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 7eeaecfe6e1619d48af59982c75352c634ebc123..bfdf0857a130948378c67936f36be2a3d4c1b542 100644 +index f0666c85eafc802837380175f2e945f41cef0da1..d106cd682d03bfddd1f441ed43081b41f722d5c4 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -256,6 +256,7 @@ public class ServerPlayer extends Player { @@ -44,7 +44,7 @@ index 7eeaecfe6e1619d48af59982c75352c634ebc123..bfdf0857a130948378c67936f36be2a3 } // CraftBukkit start - World fallback code, either respawn location or global spawn -@@ -2586,5 +2589,13 @@ public class ServerPlayer extends Player { +@@ -2587,5 +2590,13 @@ public class ServerPlayer extends Player { public void tpsBar(boolean tpsBar) { this.tpsBar = tpsBar; } diff --git a/patches/server/0242-Signs-allow-color-codes.patch b/patches/server/0242-Signs-allow-color-codes.patch index 93226cf2a..262e868f0 100644 --- a/patches/server/0242-Signs-allow-color-codes.patch +++ b/patches/server/0242-Signs-allow-color-codes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Signs allow color codes diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index bfdf0857a130948378c67936f36be2a3d4c1b542..f280aaa6d1ed35ffb5f746631c36467b63a7bd56 100644 +index d106cd682d03bfddd1f441ed43081b41f722d5c4..67590108d9f9e889ef9483722bdae0efa10de1ce 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1501,6 +1501,7 @@ public class ServerPlayer extends Player { @@ -17,7 +17,7 @@ index bfdf0857a130948378c67936f36be2a3d4c1b542..f280aaa6d1ed35ffb5f746631c36467b this.connection.send(new ClientboundBlockUpdatePacket(this.level, sign.getBlockPos())); this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos())); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 16428e0163924057b5256c4e755ee64194facfd2..460282a6ca0c997879a9bea97568d7146c047719 100644 +index a0965856851a4a3337c55d9796952737bb63b26d..b7a941c0663f233e63f3cce0a048112bd56b0abb 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3194,11 +3194,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -42,10 +42,10 @@ index 16428e0163924057b5256c4e755ee64194facfd2..460282a6ca0c997879a9bea97568d714 SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.player.getBukkitEntity(), lines); this.cserver.getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java -index 6371176fba41218a209ea59b4cafe5b2d4a685fd..7666bca74f4f68bb4e902ec2eb7c4895adbb9373 100644 +index d5bcc81a809e3c733c6fc11309bcf0913860edf6..96b70ae604695fbe651f8640be5c6d0e1a3109df 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java -@@ -184,6 +184,23 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C +@@ -186,6 +186,23 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C return ClientboundBlockEntityDataPacket.create(this); } diff --git a/patches/server/0264-Lobotomize-stuck-villagers.patch b/patches/server/0264-Lobotomize-stuck-villagers.patch index 0a134027f..5935dd80c 100644 --- a/patches/server/0264-Lobotomize-stuck-villagers.patch +++ b/patches/server/0264-Lobotomize-stuck-villagers.patch @@ -95,10 +95,10 @@ index 59bfaf90d448223c5aee9b18d2915539f54f0d4b..b5db8212aa6b20fbaa8ea7dbcd14c9cc if (this.assignProfessionWhenSpawned) { this.assignProfessionWhenSpawned = false; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java -index 6de6553e79c9729ef49e2a544730b1ac1020dff2..1c9f3b42cbd0aa423e2f7b96ea9c68e2a3260ec6 100644 +index f0b910df1ee471b4d72d97c6197ab14f2854976e..6ce32a52d621a0c2629568ea07e445f50160d97d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java -@@ -193,4 +193,11 @@ public class CraftVillager extends CraftAbstractVillager implements Villager { +@@ -194,4 +194,11 @@ public class CraftVillager extends CraftAbstractVillager implements Villager { getHandle().getGossips().getReputations().clear(); } // Paper end