Repo-Mirror/SparklyPaperMC
9
0
Fork 0
mirror of https://github.com/SparklyPower/SparklyPaper.git synced 2026-01-04 15:41:34 +00:00
Code Issues Releases Activity

Move RedstoneWireTurbo instance to be per world instead of sharing a global instance

Browse Source 
Fixes #12
This commit is contained in:
MrPowerGamerBR
2024-03-20 14:08:37 -03:00
parent a98f3e2c35
commit 89d1082cf2
9 changed files with 92 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0002-SparklyPaper-config-files.patch
View File

@@ -25,7 +25,7 @@ index 68d268b6fff126e8645b6deec3fb549ea2286b77..d61cf0d713dcdef5a7081142838ee696
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // Paper - init PaperBrigadierProvider
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 19f23a6c8fb5c02843c27fb8a242ec9d0d1b538b..e199c852f4c493dbe6ab776d18b91a53e5a36f7c 100644
index bc89f9e90af3d69872a58c47a4c2545ba91b6ba5..a246c6781a16d0cf9097a0589b1287110750a258 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -173,6 +173,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -36,7 +36,7 @@ index 19f23a6c8fb5c02843c27fb8a242ec9d0d1b538b..e199c852f4c493dbe6ab776d18b91a53
public final co.aikar.timings.WorldTimingsHandler timings; // Paper
public static BlockPos lastPhysicsProblem; // Spigot
private org.spigotmc.TickLimiter entityLimiter;
@@ -210,6 +211,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -219,6 +220,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - create paper world config; Async-Anti-Xray: Pass executor
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
@@ -116,7 +116,7 @@ index 0000000000000000000000000000000000000000..bc0ec96f91f7c9ab9f9a865a50f69707
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 404e5715a43068fb3338e7bcef52f8967e1e4bb4..3754360b3be729e7fa03697543e219506a5499b4 100644
index 73e765b5b1e38dfaafa323cf4e419ba0a5e34705..c03009cc333f72245429f2448b3a2b0605c38615 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -112,6 +112,7 @@ import net.minecraft.world.level.storage.PrimaryLevelData;
@@ -152,7 +152,7 @@ index 404e5715a43068fb3338e7bcef52f8967e1e4bb4..3754360b3be729e7fa03697543e21950
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index ce341f42b3a5e17fb6d1f7de8057e73137ae2a6e..8851fd0dbca2d788b16dec92a121ad00f209459a 100644
index 8d626fadcd4743b6472a2954d2b1b2ec89669814..1349df0a0f59977cb4ddf694b771707a03a70793 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -174,6 +174,14 @@ public class Main {