From 082734f817198097e020ed69e3c063d9a4aa29d2 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Thu, 15 Dec 2022 07:59:50 -0600
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@20503be Remove guardian beam render issue workaround
---
 gradle.properties                             |  2 +-
 .../0100-Configurable-daylight-cycle.patch    |  4 +--
 patches/server/0309-Fix-Paper-8640.patch      | 32 -------------------
 3 files changed, 3 insertions(+), 35 deletions(-)
 delete mode 100644 patches/server/0309-Fix-Paper-8640.patch

diff --git a/gradle.properties b/gradle.properties
index dda2524a6..c001b86c6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19.3-R0.1-SNAPSHOT
 
-paperCommit = eec64a4e057c4eeec42d92cbaaee0eefb5c38081
+paperCommit = 20503beee52dc56d3f6e00707ee621413e100a11
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0100-Configurable-daylight-cycle.patch b/patches/server/0100-Configurable-daylight-cycle.patch
index c3a1dacdb..d6fbd8ad4 100644
--- a/patches/server/0100-Configurable-daylight-cycle.patch
+++ b/patches/server/0100-Configurable-daylight-cycle.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable daylight cycle
 
 
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java
-index 689ad22925b2561f7c8db961743eb1f821dbb25f..fa3c960992cc240161817e54659d83fed259f2fe 100644
+index 9ec6145fe04ec64bbee8ec6a837719caebdbc6f5..358d610ad020cada1bb83e393deeeaaec05a2791 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java
 @@ -5,7 +5,7 @@ import net.minecraft.network.protocol.Packet;
@@ -16,7 +16,7 @@ index 689ad22925b2561f7c8db961743eb1f821dbb25f..fa3c960992cc240161817e54659d83fe
 +    private long dayTime; public void setDayTime(long dayTime) { this.dayTime = dayTime; } // Purpur
  
      public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
-         this.gameTime = time % 192000; // Paper - fix guardian beam
+         this.gameTime = time;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
 index 96f50760dec9fb7ec317b500ce5cd6a69eb56f02..1953eaab247d7482773cac79dafd651a23dff2da 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
diff --git a/patches/server/0309-Fix-Paper-8640.patch b/patches/server/0309-Fix-Paper-8640.patch
deleted file mode 100644
index efac32869..000000000
--- a/patches/server/0309-Fix-Paper-8640.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <blake.galbreath@gmail.com>
-Date: Thu, 15 Dec 2022 02:03:38 -0600
-Subject: [PATCH] Fix Paper#8640
-
-
-diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java
-index fa3c960992cc240161817e54659d83fed259f2fe..b9c24f56b4ec36c07f188b6c406186684a2b3f4f 100644
---- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java
-+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java
-@@ -8,7 +8,7 @@ public class ClientboundSetTimePacket implements Packet<ClientGamePacketListener
-     private long dayTime; public void setDayTime(long dayTime) { this.dayTime = dayTime; } // Purpur
- 
-     public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
--        this.gameTime = time % 192000; // Paper - fix guardian beam
-+        this.gameTime = time % 192000; // Paper - fix guardian beam // Purpur - diff on change
-         long l = timeOfDay;
-         if (!doDaylightCycle) {
-             l = -timeOfDay;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index f9d77ad2493b9ba67e8f45ce248d29a8e9ab7b80..be6a6617e5312601c25c1bf3dce3f577c19437b9 100644
---- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-@@ -590,7 +590,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Rider
- 
-     @VisibleForTesting
-     public void resetLastPoseChangeTick(long lastPoseTick) {
--        this.entityData.set(LAST_POSE_CHANGE_TICK, lastPoseTick);
-+        this.entityData.set(LAST_POSE_CHANGE_TICK, lastPoseTick % 192000); // Purpur - paper alter's client time in Paper#8630, last pose tick must match
-     }
- 
-     public long getPoseTime() {