mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Replace ConfiguredStructure api with Structure (#8642)

Browse source
This commit is contained in:
Jake Potrebic 2023-02-28 08:36:01 -08:00 • committed by GitHub
parent f408c253ec
commit e57441254d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
75 changed files with 283 additions and 486 deletions
Download patch file Download diff file Expand all files Collapse all files

10
patches/server/0018-Rewrite-chunk-system.patch
View file

@ -11844,13 +11844,13 @@ index 0000000000000000000000000000000000000000..a6fb7ae77d7cad2243e28a33718e4631
+
+}
diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
index 9798a1010120125039cbf226a0e3679cc92f92c7..cf3e083c2ada3275a52c303de16a62576696e83f 100644
index 902317d2dc198a1cbfc679810bcb2173644354cb..d58d44faa40be2421f4cb54740a3abdbad72875c 100644
--- a/src/main/java/io/papermc/paper/util/MCUtil.java
+++ b/src/main/java/io/papermc/paper/util/MCUtil.java
@@ -1,16 +1,29 @@
package io.papermc.paper.util;
@@ -2,16 +2,29 @@ package io.papermc.paper.util;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import io.papermc.paper.math.Position;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.internal.Streams;
@ -11877,7 +11877,7 @@ index 9798a1010120125039cbf226a0e3679cc92f92c7..cf3e083c2ada3275a52c303de16a6257
import org.apache.commons.lang.exception.ExceptionUtils;
import org.bukkit.Location;
import org.bukkit.block.BlockFace;
@@ -20,8 +33,11 @@ import org.spigotmc.AsyncCatcher;
@@ -21,8 +34,11 @@ import org.spigotmc.AsyncCatcher;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@ -11889,7 +11889,7 @@ index 9798a1010120125039cbf226a0e3679cc92f92c7..cf3e083c2ada3275a52c303de16a6257
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.LinkedBlockingQueue;
@@ -506,6 +522,100 @@ public final class MCUtil {
@@ -511,6 +527,100 @@ public final class MCUtil {
}
}