From c054fc50863a7df8b423f0006c602a3c2ebbe231 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Thu, 2 Jun 2022 20:54:29 -0500 Subject: [PATCH] Update Paper --- gradle.properties | 2 +- ...date-coordinates-before-attempting-to-get-block-.patch | 4 ++-- .../0023-Better-handling-of-invalid-JSON-components.patch | 4 ++-- ...ent-crash-paintings-and-similar-entity-OOB-explo.patch | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index 59b1d5a..7ed51aa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.18.2-R0.1-SNAPSHOT mcVersion=1.18.2 -paperRef=00c6ae8419560bec77216f4db7bd710a16a8239e +paperRef=80d5e71908d7a555289b2e478245879f9e3bcb55 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0022-Validate-coordinates-before-attempting-to-get-block-.patch b/patches/server/0022-Validate-coordinates-before-attempting-to-get-block-.patch index ce5f4ac..8a37df7 100644 --- a/patches/server/0022-Validate-coordinates-before-attempting-to-get-block-.patch +++ b/patches/server/0022-Validate-coordinates-before-attempting-to-get-block-.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Validate coordinates before attempting to get block entities diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 9df5b678ce4343d0bb54133393f6bbe40fe5366b..4186c5c880e94d858fa7e661a1c795269170cf31 100644 +index 901fa17d0f0a3f66923f68f13f183bc4c17f7748..dc9199c0b1fa9b8779afc51d7af4c516d217ddb3 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2990,20 +2990,25 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -2991,20 +2991,25 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser if (this.player.gameMode.isCreative()) { boolean flag = packet.getSlotNum() < 0; ItemStack itemstack = packet.getItem(); diff --git a/patches/server/0023-Better-handling-of-invalid-JSON-components.patch b/patches/server/0023-Better-handling-of-invalid-JSON-components.patch index db85d50..2f00e0a 100644 --- a/patches/server/0023-Better-handling-of-invalid-JSON-components.patch +++ b/patches/server/0023-Better-handling-of-invalid-JSON-components.patch @@ -115,10 +115,10 @@ index e3dc56de3f91e03b1543257f72448a734d914ed7..f518e47818a47be0dfd7cccc4845ba97 return new TextComponent(""); }); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 49cf3601df7b145d49b1fe9a71ba0bc60c5394b3..9ed0f73eb9b5b3b06dd1639dac6152e3c6b5b4d7 100644 +index dfd1f37757af1bd808cc2e2d8bf97123adf638bb..876e8f83fab4e255959948e59cabf05478446e4d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2214,12 +2214,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2215,12 +2215,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.setRot(this.getYRot(), this.getXRot()); if (nbt.contains("CustomName", 8)) { String s = nbt.getString("CustomName"); diff --git a/patches/server/0032-Prevent-crash-paintings-and-similar-entity-OOB-explo.patch b/patches/server/0032-Prevent-crash-paintings-and-similar-entity-OOB-explo.patch index 63d5e2b..4d10fdd 100644 --- a/patches/server/0032-Prevent-crash-paintings-and-similar-entity-OOB-explo.patch +++ b/patches/server/0032-Prevent-crash-paintings-and-similar-entity-OOB-explo.patch @@ -147,7 +147,7 @@ index 0000000000000000000000000000000000000000..fd22a200e070ca5a594802d2f201c6b2 + } +} diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index bc9e6a2403d2e0d174c87f9bcb54dc4af47c610b..5fffd4f1661a20522d1bb85308901826dfaf7dd9 100644 +index 876e8f83fab4e255959948e59cabf05478446e4d..886451893fbc30576249ca6816c2579127acfe06 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1,5 +1,6 @@ @@ -157,7 +157,7 @@ index bc9e6a2403d2e0d174c87f9bcb54dc4af47c610b..5fffd4f1661a20522d1bb85308901826 import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList.Builder; import com.google.common.collect.Iterables; -@@ -1774,6 +1775,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1775,6 +1776,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public void moveTo(double x, double y, double z, float yaw, float pitch) { @@ -171,7 +171,7 @@ index bc9e6a2403d2e0d174c87f9bcb54dc4af47c610b..5fffd4f1661a20522d1bb85308901826 // Paper - cancel entity velocity if teleported if (!preserveMotion) { this.deltaMovement = Vec3.ZERO; -@@ -3208,6 +3216,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3209,6 +3217,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @Nullable public Entity teleportTo(ServerLevel worldserver, BlockPos location) { @@ -182,7 +182,7 @@ index bc9e6a2403d2e0d174c87f9bcb54dc4af47c610b..5fffd4f1661a20522d1bb85308901826 // CraftBukkit end // Paper start - fix bad state entities causing dupes if (!isAlive() || !valid) { -@@ -4102,6 +4114,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4103,6 +4115,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.setPosRaw(x, y, z, false); } public final void setPosRaw(double x, double y, double z, boolean forceBoundingBoxUpdate) {