From 79d30f702653049d7bd4623d89e478abc4424a16 Mon Sep 17 00:00:00 2001
From: Etil <81570777+etil2jz@users.noreply.github.com>
Date: Sun, 9 Jan 2022 13:36:42 +0100
Subject: [PATCH] Update Upstream (Pufferfish)

---
 gradle.properties                             | 2 +-
 patches/server/0014-Use-XoRoShiRoRandom.patch | 6 +++---
 patches/server/0068-World-Instance-Flag.patch | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index b17859d..3f0012c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=wtf.etil.mirai
 version=1.18.1-R0.1-SNAPSHOT
 mcVersion=1.18.1
 packageVersion=1_18_R1
-pufferfishRef=9aa81a51e1d324e912c11fc22fec66bee0840d6c
+pufferfishRef=809bd9f1cf87fe9e71a7a3f924398a405e32db04
 
 org.gradle.caching=true
 org.gradle.caching.debug=false
diff --git a/patches/server/0014-Use-XoRoShiRoRandom.patch b/patches/server/0014-Use-XoRoShiRoRandom.patch
index f072e93..3ff4898 100644
--- a/patches/server/0014-Use-XoRoShiRoRandom.patch
+++ b/patches/server/0014-Use-XoRoShiRoRandom.patch
@@ -20,7 +20,7 @@ index 20cfe7b9b7127ddeb97aa91d759fc17b4a548eaf..34665a768285fd99e49d57d3879deb1f
      private long lastFill = -1;
      private long nextRefill = -1;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 819fc4b53b5f2f9dc9c25641be644218d3d4f460..1e02e916815e14bce466bd02d9ffe664d456cfbc 100644
+index 663ab7f3c2e7514c211f01114aa8869f24615da0..5830bda766ea88bb45096d900afe76600ce2f9e0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -415,7 +415,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -253,10 +253,10 @@ index d33af84300db18ea2b71dba2c9ed43390a293500..e60d244c44396ec09ecff889d8b9543b
  
                      MinecraftServer minecraftServer = this.level.getServer();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ac41bc23d2f7e16bbacdc9b33fcf6c0d706fa023..010c4761ba43c9c856e2daf33615967b4687fb82 100644
+index c28f7074a07051ea9aee5dc67dfef9193426a42d..7ca746e36a98e0b7d7e47c68962975242c4dd070 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -204,7 +204,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -229,7 +229,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      }
      // Paper end
  
diff --git a/patches/server/0068-World-Instance-Flag.patch b/patches/server/0068-World-Instance-Flag.patch
index fad007c..97c54fb 100644
--- a/patches/server/0068-World-Instance-Flag.patch
+++ b/patches/server/0068-World-Instance-Flag.patch
@@ -19,10 +19,10 @@ index 2d2f1e3fe1c9314af18377458af74f8c6afa7603..4df7088e81ee6ccc7705d2c220ae80c3
          return new Throwable(entity + " Added to world at " + new java.util.Date());
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 010c4761ba43c9c856e2daf33615967b4687fb82..6a72d883029f4b69395afffcb3e2ac36fe41942a 100644
+index 7ca746e36a98e0b7d7e47c68962975242c4dd070..f404b38242485d081ecaad34a43eadcd9950cad2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1200,6 +1200,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1225,6 +1225,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          world.noSave = !value;
      }