From b28cb6d88774deebf42e3210cea82d97ad3f3fbf Mon Sep 17 00:00:00 2001 From: Cryptite Date: Mon, 18 Oct 2021 08:53:16 -0500 Subject: [PATCH] World instance flag, update paper --- gradle.properties | 2 +- patches/api/0007-World-Instance-Flag.patch | 22 ++++++++++ patches/server/0001-Build-Changes.patch | 12 +++--- patches/server/0015-World-Instance-Flag.patch | 41 +++++++++++++++++++ 4 files changed, 70 insertions(+), 7 deletions(-) create mode 100644 patches/api/0007-World-Instance-Flag.patch create mode 100644 patches/server/0015-World-Instance-Flag.patch diff --git a/gradle.properties b/gradle.properties index 5f55ca382..2ac217f2d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=com.lokamc.slice version=1.17.1-R0.1-SNAPSHOT mcVersion=1.17.1 -paperRef=cd610df101fe36efe946b841f5e1f04446db1661 +paperRef=eaee7a2473baa4e8a51fea63b2dcf0ff7bda31b3 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/0007-World-Instance-Flag.patch b/patches/api/0007-World-Instance-Flag.patch new file mode 100644 index 000000000..92a05e068 --- /dev/null +++ b/patches/api/0007-World-Instance-Flag.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cryptite +Date: Mon, 18 Oct 2021 08:52:40 -0500 +Subject: [PATCH] World Instance Flag + + +diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java +index 4f673e9123145dc78564dc3eef0edf75795dafc2..c840fccc7d5eab215886c3281be3a6257fa01aad 100644 +--- a/src/main/java/org/bukkit/World.java ++++ b/src/main/java/org/bukkit/World.java +@@ -2606,6 +2606,11 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient + */ + public void setAutoSave(boolean value); + ++ // Slice start ++ public boolean isInstance(); ++ public void setInstance(boolean value); ++ // Slice end ++ + /** + * Sets the Difficulty of the world. + * diff --git a/patches/server/0001-Build-Changes.patch b/patches/server/0001-Build-Changes.patch index 104aa830a..576097a60 100644 --- a/patches/server/0001-Build-Changes.patch +++ b/patches/server/0001-Build-Changes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Build Changes diff --git a/build.gradle.kts b/build.gradle.kts -index cb1a931417073908be5c7aa1af710477775b3dbd..0c3c936990f161eb3de9a33f8983e4da571befac 100644 +index 13f89bdaf1ada33060b1ee4d6f2860ec194b68a4..2de428cb94a8637242ef93f007f77e031f992c5b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -28,8 +28,8 @@ repositories { +@@ -25,8 +25,8 @@ repositories { } dependencies { @@ -19,7 +19,7 @@ index cb1a931417073908be5c7aa1af710477775b3dbd..0c3c936990f161eb3de9a33f8983e4da // Paper start implementation("org.jline:jline-terminal-jansi:3.12.1") implementation("net.minecrell:terminalconsoleappender:1.2.0") -@@ -81,7 +81,7 @@ tasks.jar { +@@ -78,7 +78,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -28,7 +28,7 @@ index cb1a931417073908be5c7aa1af710477775b3dbd..0c3c936990f161eb3de9a33f8983e4da "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -206,7 +206,7 @@ tasks.test { +@@ -204,7 +204,7 @@ tasks.test { fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -38,7 +38,7 @@ index cb1a931417073908be5c7aa1af710477775b3dbd..0c3c936990f161eb3de9a33f8983e4da workingDir = rootProject.layout.projectDirectory.dir( providers.gradleProperty("runWorkDir").forUseAtConfigurationTime().orElse("run") diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index fe6d5051b139cd6079e288ffdf20e30fdd46fdda..c3c2b44c998ccb73594e4f33a571508a4c8d7d77 100644 +index c8876b000a03f18e7a140167ed4505a9843a8d14..9f72d4d8f1b00f9ab1e93406fcb9921c5d4769a6 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1721,7 +1721,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop +Date: Mon, 18 Oct 2021 08:52:40 -0500 +Subject: [PATCH] World Instance Flag + + +diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java +index a62abcb2e05198001516cf2402dc7ead09761905..3bb1732b9bdb098b6f543c778c299e44e32c5ce2 100644 +--- a/src/main/java/net/minecraft/server/level/ServerLevel.java ++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java +@@ -200,6 +200,7 @@ public class ServerLevel extends Level implements WorldGenLevel { + public final UUID uuid; + public boolean hasPhysicsEvent = true; // Paper + public boolean hasEntityMoveEvent = false; // Paper ++ public boolean instance; // Slice + public static Throwable getAddToWorldStackTrace(Entity entity) { + 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 00d8b61c04ac91770b0ff3b846d3ff70bef2e8e7..d7a755092370b7478fb8aa8b8e211c01f430ff5e 100644 +--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java ++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +@@ -1196,6 +1196,18 @@ public class CraftWorld extends CraftRegionAccessor implements World { + world.noSave = !value; + } + ++ // Slice start ++ @Override ++ public boolean isInstance() { ++ return world.instance; ++ } ++ ++ @Override ++ public void setInstance(boolean value) { ++ world.instance = value; ++ } ++ // Slice end ++ + @Override + public void setDifficulty(Difficulty difficulty) { + this.getHandle().serverLevelData.setDifficulty(net.minecraft.world.Difficulty.byId(difficulty.getValue()));