From d0c2d7d2acf8665c8a8975d77597e8f5979b2acb Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Sun, 10 Dec 2023 20:24:15 -0600
Subject: [PATCH] Update Paper

---
 gradle.properties                                             | 2 +-
 .../server/0036-Patch-invalid-entity-rotation-log-spam.patch  | 4 ++--
 .../0039-Prevent-player-banning-using-duplicate-UUIDs.patch   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index b6d2957..f4058b4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=me.totalfreedom.scissors
 version=1.20.4-R0.1-SNAPSHOT
 
 mcVersion=1.20.4
-paperRef=dd16335e40dc13843e8ae7c681ca0a166d2e54a0
+paperRef=28abbaa7bda4a072711315cdbe9bd992eaf63c93
 
 org.gradle.caching=true
 org.gradle.parallel=true
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 e19406d..510b377 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 e8845d6ec1bcba6df2eb8e1af0d658b10299831a..015d5e9b6de5f1fb466e1801bdf5fb430ba91f35 100644
+index e3ac487e246875f5f9ee6f32746da33c0de8200e..4d7bdd8d87158948a3eb28473777eb939a1adac6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4696,7 +4696,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4739,7 +4739,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
  
      public void setXRot(float pitch) {
          if (!Float.isFinite(pitch)) {
diff --git a/patches/server/0039-Prevent-player-banning-using-duplicate-UUIDs.patch b/patches/server/0039-Prevent-player-banning-using-duplicate-UUIDs.patch
index 5338b82..5b99e9c 100644
--- a/patches/server/0039-Prevent-player-banning-using-duplicate-UUIDs.patch
+++ b/patches/server/0039-Prevent-player-banning-using-duplicate-UUIDs.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent player banning using duplicate UUIDs
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 17610196db7a1c6feb2cf74a02479a8691aa323f..70c52e2293d64d32fdcebbcd0678e0c80d35fbb8 100644
+index b78a9628a88f2a495ef6de74446a02a14d41a1f6..04f3d427dabf04b12c7fb6e7991c4af5e8d6e4a8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1644,7 +1644,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1668,7 +1668,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (entity != null) {
              ServerLevel.LOGGER.warn("Force-added player with duplicate UUID {}", player.getUUID());
              entity.unRide();