Skip to content

Commit f60c5c1

Browse files
Owen1212055kennytv
Owen1212055
authored and
kennytv
committed
Add spigot configuration migration / move more away from getName()
1 parent 88e8e53 commit f60c5c1

14 files changed

Lines changed: 104 additions & 91 deletions

‎paper-server/patches/features/0001-Moonrise-optimisation-patches.patch‎

Lines changed: 37 additions & 37 deletions
Large diffs are not rendered by default.

‎paper-server/patches/features/0005-Entity-Activation-Range-2.0.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ index 0000000000000000000000000000000000000000..ce6b57eeeeb1bd652f4bb53c19dcfbc0
354354
+ }
355355
+}
356356
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
357-
index 96e45eab1e8cf857f5068e911070259866d8bdcb..a0477b407d41ab7391f764b3d21352f410dde9a5 100644
357+
index 3cd2fcc38f3989bb5124ba5bc2f4597103e7a111..6d847ff3646b27fe9bc75e792d813a7f611ab3e5 100644
358358
--- a/net/minecraft/server/level/ServerLevel.java
359359
+++ b/net/minecraft/server/level/ServerLevel.java
360360
@@ -857,6 +857,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
@@ -816,10 +816,10 @@ index 3a590d4dc980a2912e9cc043d8c8db4cf9d60803..06ab7c48b18c03af494ab10fc2b584ce
816816
+
817817
}
818818
diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
819-
index 2569893356946511fc8c29b51220014519f7bad1..83041532ee49be800c66995ad64d570270349fb6 100644
819+
index 0958fe0438c3e934b885acf78a0f8003ef8bb694..31c7223d2d01573c24d4ad83737fa2c2752db028 100644
820820
--- a/net/minecraft/world/level/Level.java
821821
+++ b/net/minecraft/world/level/Level.java
822-
@@ -154,6 +154,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
822+
@@ -155,6 +155,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
823823
@Nullable
824824
public List<net.minecraft.world.entity.item.ItemEntity> captureDrops;
825825
public final it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap<SpawnCategory> ticksPerSpawnCategory = new it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap<>();

‎paper-server/patches/features/0016-Add-Alternate-Current-redstone-implementation.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2326,7 +2326,7 @@ index 0000000000000000000000000000000000000000..298076a0db4e6ee6e4775ac43bf749d9
23262326
+ }
23272327
+}
23282328
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
2329-
index a0477b407d41ab7391f764b3d21352f410dde9a5..8d691aab8eb8db16074d2f46c448f5366d850b8c 100644
2329+
index 6d847ff3646b27fe9bc75e792d813a7f611ab3e5..cfc30654917703a9278143a2c36d37eb719ee061 100644
23302330
--- a/net/minecraft/server/level/ServerLevel.java
23312331
+++ b/net/minecraft/server/level/ServerLevel.java
23322332
@@ -232,6 +232,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
@@ -2352,10 +2352,10 @@ index a0477b407d41ab7391f764b3d21352f410dde9a5..8d691aab8eb8db16074d2f46c448f536
23522352
return toLevel.dimension() != Level.NETHER || this.getGameRules().get(GameRules.ALLOW_ENTERING_NETHER_USING_PORTALS);
23532353
}
23542354
diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
2355-
index 83041532ee49be800c66995ad64d570270349fb6..ae9bc7cb3ebb245d78e50b69702facec8f0b75ac 100644
2355+
index 31c7223d2d01573c24d4ad83737fa2c2752db028..8df070a7135411806d42ea692b566c4d8389a47b 100644
23562356
--- a/net/minecraft/world/level/Level.java
23572357
+++ b/net/minecraft/world/level/Level.java
2358-
@@ -2151,6 +2151,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
2358+
@@ -2152,6 +2152,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
23592359
return this.palettedContainerFactory;
23602360
}
23612361

‎paper-server/patches/features/0020-Incremental-chunk-and-player-saving.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Incremental chunk and player saving
55

66

77
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
8-
index 65a971379f35c4b1b519b93787f690d891e29523..dadad4106e774884bc32af0ce37591b08c6d9a4c 100644
8+
index def29f67aa4d901fd61cb546f65b763b3da09131..a3edf217dd2ffce19dc1111402975ba12bb86bad 100644
99
--- a/net/minecraft/server/MinecraftServer.java
1010
+++ b/net/minecraft/server/MinecraftServer.java
11-
@@ -957,7 +957,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
11+
@@ -958,7 +958,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
1212
}
1313
public boolean saveAllChunks(final boolean silent, final boolean flush, final boolean force, final boolean close) {
1414
// Paper end - add close param
@@ -17,7 +17,7 @@ index 65a971379f35c4b1b519b93787f690d891e29523..dadad4106e774884bc32af0ce37591b0
1717
boolean result = false;
1818

1919
for (ServerLevel level : this.getAllLevels()) {
20-
@@ -969,13 +969,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
20+
@@ -970,13 +970,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2121
result = true;
2222
}
2323

@@ -32,7 +32,7 @@ index 65a971379f35c4b1b519b93787f690d891e29523..dadad4106e774884bc32af0ce37591b0
3232

3333
if (flush) {
3434
for (ServerLevel level : this.getAllLevels()) {
35-
@@ -989,11 +983,25 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
35+
@@ -990,11 +984,25 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
3636
return result;
3737
}
3838

@@ -59,7 +59,7 @@ index 65a971379f35c4b1b519b93787f690d891e29523..dadad4106e774884bc32af0ce37591b0
5959
boolean result = this.saveAllChunks(silent, flush, force);
6060
this.warnOnLowDiskSpace();
6161
var5 = result;
62-
@@ -1640,9 +1648,31 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
62+
@@ -1641,9 +1649,31 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
6363
}
6464

6565
this.ticksUntilAutosave--;
@@ -94,7 +94,7 @@ index 65a971379f35c4b1b519b93787f690d891e29523..dadad4106e774884bc32af0ce37591b0
9494
ProfilerFiller profiler = Profiler.get();
9595
this.server.spark.executeMainThreadTasks(); // Paper - spark
9696
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
97-
index 18eb79f76fb558a1ba9f989f59d2f273975be3a1..7a55657f9fb106dc3e95ef808d103a66cf2e56bd 100644
97+
index cfc30654917703a9278143a2c36d37eb719ee061..78021db10860396fef4eb2e01926fbad123916fa 100644
9898
--- a/net/minecraft/server/level/ServerLevel.java
9999
+++ b/net/minecraft/server/level/ServerLevel.java
100100
@@ -1441,6 +1441,15 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet

‎paper-server/patches/features/0025-Optimise-EntityScheduler-ticking.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ index 2bc436cdf5180a7943c45fabb9fbbedae6f7db56..f312a7f5b1b2a777ab36b94ce7cbf387
2020

2121
@Override
2222
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
23-
index dadad4106e774884bc32af0ce37591b08c6d9a4c..b7a0963390540c283cede90108f96437bfdd4dab 100644
23+
index a3edf217dd2ffce19dc1111402975ba12bb86bad..2b6717833b56c3e33f3ac656a376dd5c841dc1bc 100644
2424
--- a/net/minecraft/server/MinecraftServer.java
2525
+++ b/net/minecraft/server/MinecraftServer.java
26-
@@ -1783,32 +1783,22 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
26+
@@ -1784,32 +1784,22 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2727
}
2828
}
2929

‎paper-server/patches/features/0026-DataConverter-Moonrise-co-fixes.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ index d2877c20f389d0131e1dd208b464f590671e5d82..27bdc70d861ca39487ad16cb3afb89d6
4242
updateComponent(root, "minecraft:trim", hiddenComponents);
4343
updateComponent(root, "minecraft:unbreakable", hiddenComponents);
4444
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
45-
index 1d93a864c5fc040b5ec7c48b4db0bd54cd6255ff..33763013daa99ed9146cd526e245e91a78851aa5 100644
45+
index ae140a514e1e3200f52c5933f886cc9e820b818a..4a1146cc54bd9272466ffc9bb64f600c40f0c0f4 100644
4646
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
4747
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
4848
@@ -1820,9 +1820,14 @@ public class ServerGamePacketListenerImpl
@@ -62,10 +62,10 @@ index 1d93a864c5fc040b5ec7c48b4db0bd54cd6255ff..33763013daa99ed9146cd526e245e91a
6262
);
6363

6464
diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
65-
index ae9bc7cb3ebb245d78e50b69702facec8f0b75ac..72f8f3ca5d0c5ac99a9850809f8412e281376732 100644
65+
index 8df070a7135411806d42ea692b566c4d8389a47b..06451a21c4bfbcd95063f96246013d63f65af8a3 100644
6666
--- a/net/minecraft/world/level/Level.java
6767
+++ b/net/minecraft/world/level/Level.java
68-
@@ -1527,7 +1527,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
68+
@@ -1528,7 +1528,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
6969
if (entity instanceof net.minecraft.world.entity.decoration.ArmorStand && !entity.level().paperConfig().entities.armorStands.doCollisionEntityLookups)
7070
return false;
7171
// Paper start - optimise collisions

‎paper-server/patches/features/0029-Optimize-Hoppers.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ index 0000000000000000000000000000000000000000..24a2090e068ad3c0d08705050944abdf
4848
+ }
4949
+}
5050
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
51-
index 55b648aa13e3c8319dc50a1f93493b126535c9fa..0848c9ef4c5935b9d528146a16169f8b9142de75 100644
51+
index 2b6717833b56c3e33f3ac656a376dd5c841dc1bc..2142757965b7345a011a92de08038473fa8ae320 100644
5252
--- a/net/minecraft/server/MinecraftServer.java
5353
+++ b/net/minecraft/server/MinecraftServer.java
54-
@@ -1835,6 +1835,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
54+
@@ -1836,6 +1836,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
5555
level.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - BlockPhysicsEvent
5656
level.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent
5757
level.updateLagCompensationTick(); // Paper - lag compensation

‎paper-server/patches/features/0030-Anti-Xray.patch‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -155,15 +155,15 @@ index a94e6ca1d396b6b0781de5d550c4a804274ee003..a1018e9ca9dfb978d6e6633577abd7d5
155155

156156
private ClientboundLevelChunkWithLightPacket(final RegistryFriendlyByteBuf input) {
157157
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
158-
index b1bfa9d912778ca97cb16207c61740f684710d06..a06242b6b09221cfea2cff1f07dae2b7be58b30e 100644
158+
index 78021db10860396fef4eb2e01926fbad123916fa..3f02da2014ed8e4169f4bb819b4d9e61154b7b06 100644
159159
--- a/net/minecraft/server/level/ServerLevel.java
160160
+++ b/net/minecraft/server/level/ServerLevel.java
161161
@@ -630,7 +630,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
162162
savedDataStorage.set(io.papermc.paper.world.saveddata.PaperWorldPDC.TYPE, loadedWorldData.pdc() == null ? io.papermc.paper.world.saveddata.PaperWorldPDC.TYPE.constructor().get() : loadedWorldData.pdc());
163163
final GameRules gameRules = new GameRules(server.getWorldData().enabledFeatures(), savedDataStorage.computeIfAbsent(net.minecraft.world.level.gamerules.GameRuleMap.TYPE));
164164
this.gameRules = gameRules;
165-
- super(levelData, dimension, server.registryAccess(), levelStem.type(), false, isDebug, biomeZoomSeed, server.getMaxChainedNeighborUpdates(), loadedWorldData.bukkitName(), gen, biomeProvider, env, spigotConfig -> server.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(server.storageSource.getDimensionPath(dimension), loadedWorldData.bukkitName(), dimension.identifier(), spigotConfig, server.registryAccess(), gameRules))); // Paper - create paper world configs
166-
+ super(levelData, dimension, server.registryAccess(), levelStem.type(), false, isDebug, biomeZoomSeed, server.getMaxChainedNeighborUpdates(), loadedWorldData.bukkitName(), gen, biomeProvider, env, spigotConfig -> server.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(server.storageSource.getDimensionPath(dimension), loadedWorldData.bukkitName(), dimension.identifier(), spigotConfig, server.registryAccess(), gameRules)), executor); // Paper - create paper world configs // Paper - Anti-Xray - Pass executor
165+
- super(levelData, dimension, server.registryAccess(), levelStem.type(), false, isDebug, biomeZoomSeed, server.getMaxChainedNeighborUpdates(), loadedWorldData.bukkitName(), gen, biomeProvider, env, spigotConfig -> server.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(server.storageSource.getDimensionPath(dimension), dimension.identifier(), spigotConfig, server.registryAccess(), gameRules))); // Paper - create paper world configs
166+
+ super(levelData, dimension, server.registryAccess(), levelStem.type(), false, isDebug, biomeZoomSeed, server.getMaxChainedNeighborUpdates(), loadedWorldData.bukkitName(), gen, biomeProvider, env, spigotConfig -> server.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(server.storageSource.getDimensionPath(dimension), dimension.identifier(), spigotConfig, server.registryAccess(), gameRules)), executor); // Paper - create paper world configs // Paper - Anti-Xray - Pass executor
167167
this.weatherData = savedDataStorage.computeIfAbsent(WeatherData.TYPE);
168168
this.weatherData.setLevel(this);
169169
this.typeKey = typeKey;
@@ -209,18 +209,18 @@ index b69bcaa1e27a4fbe9a9568f3c9e1843167abe1f5..9218322801c41657c00928ef90b0de99
209209
}
210210
// Paper end - Send empty chunk
211211
diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
212-
index 72f8f3ca5d0c5ac99a9850809f8412e281376732..7034abfaf58bd685e185025a30b24754fd067734 100644
212+
index 06451a21c4bfbcd95063f96246013d63f65af8a3..e34e901dce06c6bc6060418593010dcfb38e9396 100644
213213
--- a/net/minecraft/world/level/Level.java
214214
+++ b/net/minecraft/world/level/Level.java
215-
@@ -144,6 +144,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
215+
@@ -145,6 +145,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
216216
private long subTickCount;
217217

218218
// CraftBukkit start
219219
+ public final io.papermc.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
220220
private final CraftWorld world;
221221
public org.bukkit.generator.@Nullable ChunkGenerator generator;
222222

223-
@@ -835,7 +836,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
223+
@@ -836,7 +837,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
224224
org.bukkit.generator.@Nullable BiomeProvider biomeProvider, // Paper
225225
org.bukkit.World.Environment environment, // Paper
226226
java.util.function.Function<org.spigotmc.SpigotWorldConfig, // Spigot - create per world config
@@ -230,15 +230,15 @@ index 72f8f3ca5d0c5ac99a9850809f8412e281376732..7034abfaf58bd685e185025a30b24754
230230
) {
231231
// Paper start - getblock optimisations - cache world height/sections
232232
final DimensionType dimType = dimensionTypeRegistration.value();
233-
@@ -869,6 +871,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
233+
@@ -870,6 +872,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
234234
this.palettedContainerFactory = PalettedContainerFactory.create(registryAccess);
235235
this.damageSources = new DamageSources(registryAccess);
236236
this.entityLookup = new ca.spottedleaf.moonrise.patches.chunk_system.level.entity.dfl.DefaultEntityLookup(this); // Paper - rewrite chunk system
237237
+ this.chunkPacketBlockController = this.paperConfig().anticheat.antiXray.enabled ? new io.papermc.paper.antixray.ChunkPacketBlockControllerAntiXray(this, executor) : io.papermc.paper.antixray.ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
238238
}
239239

240240
// Paper start - Cancel hit for vanished players
241-
@@ -1083,6 +1086,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
241+
@@ -1084,6 +1087,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
242242
}
243243
// CraftBukkit end - capture blockstates
244244
BlockState oldState = chunk.setBlockState(pos, blockState, updateFlags);
@@ -273,7 +273,7 @@ index c974b1c276d29610cb59566afaad19f5bcf0c602..c73b9871faa87493e081cb54e1bf1dce
273273
}
274274
}
275275
diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java
276-
index b754f87698ff263c63f2a3ee20661b82e9d16e2c..36716d4088bcfba03e98dda537ee38abef9b0089 100644
276+
index b5b514b292f9fdbe410aba5facec1638682c9075..595e97d2772b504eb6a08e84e4f4a138eb7c5f37 100644
277277
--- a/net/minecraft/world/level/chunk/LevelChunk.java
278278
+++ b/net/minecraft/world/level/chunk/LevelChunk.java
279279
@@ -152,7 +152,7 @@ public class LevelChunk extends ChunkAccess implements DebugValueSource, ca.spot

‎paper-server/patches/sources/net/minecraft/server/level/ServerLevel.java.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
+ savedDataStorage.set(io.papermc.paper.world.saveddata.PaperWorldPDC.TYPE, loadedWorldData.pdc() == null ? io.papermc.paper.world.saveddata.PaperWorldPDC.TYPE.constructor().get() : loadedWorldData.pdc());
169169
+ final GameRules gameRules = new GameRules(server.getWorldData().enabledFeatures(), savedDataStorage.computeIfAbsent(net.minecraft.world.level.gamerules.GameRuleMap.TYPE));
170170
+ this.gameRules = gameRules;
171-
+ super(levelData, dimension, server.registryAccess(), levelStem.type(), false, isDebug, biomeZoomSeed, server.getMaxChainedNeighborUpdates(), loadedWorldData.bukkitName(), gen, biomeProvider, env, spigotConfig -> server.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(server.storageSource.getDimensionPath(dimension), loadedWorldData.bukkitName(), dimension.identifier(), spigotConfig, server.registryAccess(), gameRules))); // Paper - create paper world configs
171+
+ super(levelData, dimension, server.registryAccess(), levelStem.type(), false, isDebug, biomeZoomSeed, server.getMaxChainedNeighborUpdates(), loadedWorldData.bukkitName(), gen, biomeProvider, env, spigotConfig -> server.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(server.storageSource.getDimensionPath(dimension), dimension.identifier(), spigotConfig, server.registryAccess(), gameRules))); // Paper - create paper world configs
172172
+ this.weatherData = savedDataStorage.computeIfAbsent(WeatherData.TYPE);
173173
+ this.weatherData.setLevel(this);
174174
+ this.typeKey = typeKey;

‎paper-server/patches/sources/net/minecraft/world/level/Level.java.patch‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--- a/net/minecraft/world/level/Level.java
22
+++ b/net/minecraft/world/level/Level.java
3-
@@ -91,6 +_,16 @@
3+
@@ -89,8 +_,19 @@
4+
import net.minecraft.world.phys.Vec3;
5+
import net.minecraft.world.scores.Scoreboard;
46
import org.apache.commons.lang3.mutable.MutableBoolean;
7+
+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
58
import org.jspecify.annotations.Nullable;
69

710
+// CraftBukkit start
@@ -84,7 +87,7 @@
8487
+ java.util.function.Function<org.spigotmc.SpigotWorldConfig, // Spigot - create per world config
8588
+ io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator // Paper - create paper world config
8689
) {
87-
+ this.spigotConfig = new org.spigotmc.SpigotWorldConfig(bukkitName); // Spigot
90+
+ this.spigotConfig = new org.spigotmc.SpigotWorldConfig(bukkitName, CraftNamespacedKey.fromMinecraft(dimension.identifier())); // Spigot
8891
+ this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
8992
+ this.generator = generator;
9093
+ this.world = new CraftWorld((ServerLevel) this, generator, biomeProvider, environment);

0 commit comments

Comments
 (0)