From ed986eccd1b1375264509eecf52d919feb20652d Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Tue, 25 Jul 2023 14:58:49 -0500 Subject: [PATCH] Update Paper --- gradle.properties | 2 +- .../0013-Better-handling-of-invalid-JSON-components.patch | 4 ++-- .../server/0036-Patch-invalid-entity-rotation-log-spam.patch | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index a3dde4f..b12e07b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.20.1-R0.1-SNAPSHOT mcVersion=1.20.1 -paperRef=aa93dcfdce20fd15837854d6f89d0ba82cdc5c55 +paperRef=1837f6c67798457cc3a9c16b8ba94d14dfcd8992 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0013-Better-handling-of-invalid-JSON-components.patch b/patches/server/0013-Better-handling-of-invalid-JSON-components.patch index 27b5f9c..578ef0e 100644 --- a/patches/server/0013-Better-handling-of-invalid-JSON-components.patch +++ b/patches/server/0013-Better-handling-of-invalid-JSON-components.patch @@ -128,10 +128,10 @@ index 97a2657bc98d41c3c1e376b266d2c85f685acc88..9d20f3f1af8e663a8c13714c8928d4a9 } }).reduce((accumulator, current) -> { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 305b43071aa1cf8feee75fae757bb7734ae33771..e4f1a6fe1cf59f2efd8fad1e4d629b0e6a981b77 100644 +index 4c298406ce06d39f8279049270c88ec0830733b1..1ccf49559e12f46e5324c63d5b0a3329b01c9440 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2486,12 +2486,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2485,12 +2485,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/0036-Patch-invalid-entity-rotation-log-spam.patch b/patches/server/0036-Patch-invalid-entity-rotation-log-spam.patch index 025810e..ba6abcf 100644 --- a/patches/server/0036-Patch-invalid-entity-rotation-log-spam.patch +++ b/patches/server/0036-Patch-invalid-entity-rotation-log-spam.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Patch invalid entity rotation log spam diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e4f1a6fe1cf59f2efd8fad1e4d629b0e6a981b77..245e2338eb15435b4c8641a99629451458b65bea 100644 +index 1ccf49559e12f46e5324c63d5b0a3329b01c9440..c895da05f711ada4bdf2682e5bb6c78a1100e693 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4623,7 +4623,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4622,7 +4622,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { public void setXRot(float pitch) { if (!Float.isFinite(pitch)) {