From 28b490b061a1221976b457b7a78e65448273ed95 Mon Sep 17 00:00:00 2001
From: Apehum <apehumchik@gmail.com>
Date: Tue, 30 Aug 2022 08:23:46 +0800
Subject: [PATCH] Upstream (Pufferfish)

---
 gradle.properties                             |  2 +-
 patches/server/0001-Feature-Secure-Seed.patch | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 666ba79..5acf1c9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=su.plo.matter
 
 version=1.19.2-R0.1-SNAPSHOT
 mcVersion=1.19.2
-pufferfishRef=4b26a0baf6c780a22d93f93022617cc43294ac04
+pufferfishRef=3888607ea6f8424c4a8e393d93cd21932e4500ea
 
 org.gradle.jvmargs=-Xmx2G
 
diff --git a/patches/server/0001-Feature-Secure-Seed.patch b/patches/server/0001-Feature-Secure-Seed.patch
index 8898828..63c97f4 100644
--- a/patches/server/0001-Feature-Secure-Seed.patch
+++ b/patches/server/0001-Feature-Secure-Seed.patch
@@ -56,12 +56,12 @@ index 378cc1f9e19eb9b18037ab8af92f65897e15a405..33cb2fc823624b40a32c6f5513abb073
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f58873ef4362bfcc618ead099be94ba2dd4d86ed..2309f4f831cd43d91dbfc58112173c115abcf174 100644
+index 0c71d72fb04eb00e159ddd456df82376fc912b4e..86bb20029def78a24971790e7076204ad81dd675 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -171,6 +171,10 @@ import org.bukkit.event.world.TimeSkipEvent;
- // CraftBukkit end
+@@ -172,6 +172,10 @@ import org.bukkit.event.world.TimeSkipEvent;
  import it.unimi.dsi.fastutil.ints.IntArrayList; // Paper
+ import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet; // Paper
  
 +// Matter start
 +import su.plo.matter.Globals;
@@ -70,7 +70,7 @@ index f58873ef4362bfcc618ead099be94ba2dd4d86ed..2309f4f831cd43d91dbfc58112173c11
  public class ServerLevel extends Level implements WorldGenLevel {
  
      public static final BlockPos END_SPAWN_POINT = new BlockPos(100, 50, 0);
-@@ -525,6 +529,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -528,6 +532,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          }
          chunkgenerator.conf = spigotConfig; // Spigot
          // CraftBukkit end
@@ -631,7 +631,7 @@ index 947b0b10fb965f30513fd0df5bc0910fb9cb9a71..05d7e197da45579a28ef0180d6f43a5a
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bfd4520ef6f085685a25cf7f49907e16202e6386..edeaea986a01cbdcadd72ac7034d397e1f1b3cd5 100644
+index 660d3f6e8a59751aa1d5b71f5bab72254b6065b8..0292fc6b01c08c629db4039d6bba4bab482e95c5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -243,6 +243,7 @@ import org.yaml.snakeyaml.constructor.SafeConstructor;