From 4cf3b1b30aa2869c655213cb7789cc7e4f5295cc Mon Sep 17 00:00:00 2001 From: granny Date: Sun, 8 May 2022 11:46:41 -0700 Subject: [PATCH] Updated Upstream (Paper & Pufferfish) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@1a17a83 Move redstone config changes to Eigencraft patch PaperMC/Paper@87d2eb2 Fix door breaking difficulty defaults for vindicator (#7795) PaperMC/Paper@e399754 Do not accept invalid client settings PaperMC/Paper@268476b Fix whitespace error in Alternate Current patch Pufferfish Changes: pufferfish-gg/Pufferfish@13012ba Build system updates pufferfish-gg/Pufferfish@3922e96 Updated Upstream (Paper) pufferfish-gg/Pufferfish@4053646 Updated Upstream (Paper) --- gradle.properties | 2 +- patches/server/0004-Purpur-client-support.patch | 10 +++++----- .../0045-Minecart-settings-and-WASD-controls.patch | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index bf3ae4297..6ce85b4dc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.18.2-R0.1-SNAPSHOT -paperCommit = 7a6163b41def87c559f74dba84d79a21a78e3955 +paperCommit = 268476bba3f1796fffff13a213e3ffa81ff76cc6 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0004-Purpur-client-support.patch b/patches/server/0004-Purpur-client-support.patch index e0a481ba7..6129c5e04 100644 --- a/patches/server/0004-Purpur-client-support.patch +++ b/patches/server/0004-Purpur-client-support.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Purpur client support diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 22452aa7eefa350c3b0d0d19a23c76c8ec811de3..ddf4345c48b9033f96ba237fc5c338578e39764b 100644 +index 2f5e40437d1865a874c352999edd084226d4e47b..2dcb24145bf07b186b853bd3e4c4be46495575d8 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -253,6 +253,7 @@ public class ServerPlayer extends Player { @@ -17,10 +17,10 @@ index 22452aa7eefa350c3b0d0d19a23c76c8ec811de3..ddf4345c48b9033f96ba237fc5c33857 public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet cachedSingleHashSet; // Paper diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index cc6ba95f01b82c42b4e5a0a70721ef00dd335e57..590099657a83bb0bbeeb3273040672486eaec8a4 100644 +index f115aabaf67976a503a76f5213dd52b7b7dfab4e..add383d9a2b460f48c2d822d4907bb5a12743611 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3178,6 +3178,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -3185,6 +3185,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser private static final ResourceLocation CUSTOM_UNREGISTER = new ResourceLocation("unregister"); private static final ResourceLocation MINECRAFT_BRAND = new ResourceLocation("brand"); // Paper - Brand support @@ -28,7 +28,7 @@ index cc6ba95f01b82c42b4e5a0a70721ef00dd335e57..590099657a83bb0bbeeb327304067248 @Override public void handleCustomPayload(ServerboundCustomPayloadPacket packet) { -@@ -3202,6 +3203,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -3209,6 +3210,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t unregister custom payload", ex); this.disconnect("Invalid payload UNREGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause } @@ -43,7 +43,7 @@ index cc6ba95f01b82c42b4e5a0a70721ef00dd335e57..590099657a83bb0bbeeb327304067248 try { byte[] data = new byte[packet.data.readableBytes()]; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 7e7b3692b5b7168f6122ae10fbb1772369f922fd..c0c2ac8bbeb4fc33fc62955de838cf67d9827022 100644 +index f12efe51b14ed3637a8ba45def9c94634a6f5e8f..86aaebbd2f9220b8f98417404650f9c836088f47 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2791,4 +2791,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0045-Minecart-settings-and-WASD-controls.patch b/patches/server/0045-Minecart-settings-and-WASD-controls.patch index bbdce6051..b3aea083d 100644 --- a/patches/server/0045-Minecart-settings-and-WASD-controls.patch +++ b/patches/server/0045-Minecart-settings-and-WASD-controls.patch @@ -135,13 +135,13 @@ index 024124249fafa1ed2cf0257037f655ca8fb0aea2..f6c8def0d9d2f9580a172c3a36a7db0a } } diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java -index 15e1d54cb53bcdf962b799d1deb2cade6491b433..e588650ade9f78aed4ad34fef912287e5c4013f4 100644 +index 7f83c9390823b42fc30d04e1d3222e2825eaad50..e837091037402e990f763903d851c2f70888ada7 100644 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java @@ -71,7 +71,7 @@ import net.minecraft.world.phys.shapes.VoxelShape; public abstract class BlockBehaviour { - public static final Direction[] UPDATE_SHAPE_ORDER = new Direction[]{Direction.WEST, Direction.EAST, Direction.NORTH, Direction.SOUTH, Direction.DOWN, Direction.UP}; + public static final Direction[] UPDATE_SHAPE_ORDER = new Direction[]{Direction.WEST, Direction.EAST, Direction.NORTH, Direction.SOUTH, Direction.DOWN, Direction.UP}; // Paper - public - protected final Material material; + public final Material material; // Purpur - protected -> public public final boolean hasCollision;