diff --git a/gradle.properties b/gradle.properties index d277f09..43493e4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=su.plo.matter version=1.19.3-R0.1-SNAPSHOT mcVersion=1.19.3 -pufferfishRef=9771bd7e692b5f4133e5846123c2f3a9c315e75f +pufferfishRef=053386aab6e1a14967eef84b3373d71576e61309 org.gradle.jvmargs=-Xmx2G diff --git a/patches/server/0001-Feature-Secure-Seed.patch b/patches/server/0001-Feature-Secure-Seed.patch index 7a1fbba..d81c59d 100644 --- a/patches/server/0001-Feature-Secure-Seed.patch +++ b/patches/server/0001-Feature-Secure-Seed.patch @@ -60,12 +60,12 @@ index c6f5d6756fa0e068a462d9c0ded12e0771abba37..bc77471d3f214608b18bc1a8b3199c57 } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 54a51fc23563ca7843c72c169b1e0d7f51c42412..61cd2669e9b2fcead82b5f8a78999b53a1161608 100644 +index 53198ebfa30273c5ddc1bb4324f5174ff99f688d..fdc9003eb7d609064ab2f5152f88ce432cc77d21 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -175,6 +175,10 @@ import org.bukkit.event.world.TimeSkipEvent; +@@ -174,6 +174,10 @@ import org.bukkit.event.world.TimeSkipEvent; + // CraftBukkit end import it.unimi.dsi.fastutil.ints.IntArrayList; // Paper - import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet; // Paper +// Matter start +import su.plo.matter.Globals; @@ -74,7 +74,7 @@ index 54a51fc23563ca7843c72c169b1e0d7f51c42412..61cd2669e9b2fcead82b5f8a78999b53 public class ServerLevel extends Level implements WorldGenLevel { public static final BlockPos END_SPAWN_POINT = new BlockPos(100, 50, 0); -@@ -563,6 +567,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -561,6 +565,7 @@ public class ServerLevel extends Level implements WorldGenLevel { chunkgenerator = new org.bukkit.craftbukkit.generator.CustomChunkGenerator(this, chunkgenerator, gen); } // CraftBukkit end @@ -590,7 +590,7 @@ index f7e19bb7d2ff8f8aaf061cec16462913d77c10d5..999eac6b546fd09b2f35a34545e1f714 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 277e8a03ab270eabb6b8c31d0076f3310c91eef2..71f7d110925b7243e66c01dd66ed92b85e0318dd 100644 +index 7930217aa1275c4ae70f180d483a8714d43027e8..ce02bcea7ddb61cc65307c904b686797c7021620 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -260,6 +260,9 @@ import net.md_5.bungee.api.chat.BaseComponent; // Spigot