From ab63c97218452ed0a86620a592d4d819ef4f2cc1 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <alphakr93@outlook.com>
Date: Fri, 2 Sep 2022 15:30:49 +0900
Subject: [PATCH] Updated Upstream (Paper)

---
 gradle.properties                                   |  2 +-
 patches/server/0004-Purpur-Server-Changes.patch     | 10 +++++-----
 patches/server/0023-Implement-No-Chat-Reports.patch |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index d8ba88d..8de49fc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = net.prismarineteam.prismarine
 version = 1.19.2-R0.1-SNAPSHOT
 
-paperCommit = 73e1cf01b9bed1abf213cd67a6bfc69e95a52afa
+paperCommit = 7978c8e76d1aa6ba8bd96f6476b4b998764d7286
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0004-Purpur-Server-Changes.patch b/patches/server/0004-Purpur-Server-Changes.patch
index 19fd732..39c7e7a 100644
--- a/patches/server/0004-Purpur-Server-Changes.patch
+++ b/patches/server/0004-Purpur-Server-Changes.patch
@@ -1459,7 +1459,7 @@ index 06e3a868e922f1b7a586d0ca28f64a67ae463b68..32beb045f990d4da6112da4fea295333
                          itemstack.setCount(1);
                          entityitem = entityplayer.drop(itemstack, false, false, false); // SPIGOT-2942: Add boolean to call event
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index f2692f0e24837a4c17fa914ffdf1b6c6552b7b70..c46011c4e6141ed7015fcc15494fd68235ab327b 100644
+index 1e0c56df22318af114bb352610e40143eff7cfd7..26d0737db480b36c366c0b581871cc17bab9b88b 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -223,9 +223,19 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -1537,7 +1537,7 @@ index f2692f0e24837a4c17fa914ffdf1b6c6552b7b70..c46011c4e6141ed7015fcc15494fd682
              return true;
          }
      }
-@@ -480,7 +517,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -487,7 +524,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
      }
  
      public void handleConsoleInputs() {
@@ -1546,7 +1546,7 @@ index f2692f0e24837a4c17fa914ffdf1b6c6552b7b70..c46011c4e6141ed7015fcc15494fd682
          // Paper start - use proper queue
          ConsoleInput servercommand;
          while ((servercommand = this.serverCommandQueue.poll()) != null) {
-@@ -497,7 +534,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -504,7 +541,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              // CraftBukkit end
          }
  
@@ -19584,10 +19584,10 @@ index eca9ead4368e5e2822ed8c2c665902c2544815af..3abbb0044df19b52eb2d971ac34263ed
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 089d768a9999e8c91fac9e9bafeb009bacb2cf12..d79c49797964c5bb1dd8f7ffe7b25385eb3418bc 100644
+index 55bfb6e72f0083da0173f0980263124a8e82502a..2cfe83151d423ef1e4b413ba47db68e5812771e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2231,6 +2231,48 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2234,6 +2234,48 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return (this.getHandle().dragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().dragonFight());
      }
  
diff --git a/patches/server/0023-Implement-No-Chat-Reports.patch b/patches/server/0023-Implement-No-Chat-Reports.patch
index 405f971..6a8af26 100644
--- a/patches/server/0023-Implement-No-Chat-Reports.patch
+++ b/patches/server/0023-Implement-No-Chat-Reports.patch
@@ -40,10 +40,10 @@ index 11183b4a39b9897e1b1067eb2a3556d2b1d90f52..0bd26e91b9971149a2f81f7361058038
          }
      }
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index caf801c75d212fd71e67e36f0dab6050ff54c617..08bd8b83fb39971ffa42d1d02949fecbc303b437 100644
+index 7d03832d5271641d952912bc5ed6998b5ef6e3e6..1ff77d3a4aa6644208c73bf2ac423e05c942c5f9 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -684,7 +684,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -691,7 +691,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
  
      @Override
      public boolean enforceSecureProfile() {
@@ -95,7 +95,7 @@ index d70c9d4a77edce10f783ab6c53b1e2d66b44c5fe..ed16b35a17508a04d704193885114465
          ChatMessageContent chatmessagecontent = this.getSignedContent(packet);
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 2f67ff558f107cb4fe28d725cae26de7d8707f5a..27f8506a4dbfa855526ef29718e44cd6a0bd0beb 100644
+index bd145e07b080a82ad1df0772404292cf74183f2e..5b9ab0530e4ae9b4184d5b123e3a0bcf32073d44 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1524,7 +1524,7 @@ public abstract class PlayerList {