Skip to content

Commit ff97192

Browse files
committed
Correct environment usage; remove redundant setWorld(); for IzzelAliz#1641
1 parent 216e5ec commit ff97192

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerLevelMixin.java

+6-7
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ public ResourceKey<LevelStem> getTypeKey() {
140140
// in order to avoid having to pass them as arguments.
141141
craftBridge.bridge$offerGeneratorCache(worldInfo.getLevelName(), gen);
142142
craftBridge.bridge$offerBiomeProviderCache(worldInfo.getLevelName(), biomeProvider);
143-
// Wrap the
144143
arclight$constructor(server, backgroundExecutor, levelSave, worldInfo, dimension, levelStem, statusListener, isDebug, seed, specialSpawners, shouldBeTicking, seq);
145144
bridge$getWorld();
146145
}
@@ -154,10 +153,8 @@ public ResourceKey<LevelStem> getTypeKey() {
154153
private ChunkGenerator arclight$initChunkGenerator(LevelStem instance, @Local(ordinal = -1) MinecraftServer server, @Local(ordinal = -1) ServerLevelData worldInfo) throws Throwable {
155154
// Pulling up world info init since level info is used when selecting ChunkGenerator.
156155
if (worldInfo instanceof PrimaryLevelData primary) {
157-
((WorldInfoBridge) primary).bridge$setWorld((ServerLevel) (Object) this);
158156
this.K = primary;
159157
} else {
160-
ArclightServer.LOGGER.warn("Level {} isn't initialized with PrimaryLevelData.", this.serverLevelData.getLevelName());
161158
// damn spigot again
162159
this.K = DelegateWorldInfo.wrap(worldInfo);
163160
}
@@ -166,14 +163,16 @@ public ResourceKey<LevelStem> getTypeKey() {
166163
this.biomeProvider = craftBridge.bridge$consumeBiomeProviderCache(worldInfo.getLevelName());
167164
this.generator = craftBridge.bridge$consumeGeneratorCache(worldInfo.getLevelName());
168165

169-
if (instance.type() == LevelStem.OVERWORLD) {
166+
if (instance.type().is(LevelStem.OVERWORLD.location())) {
170167
this.environment = World.Environment.NORMAL;
171-
} else if (instance.type() == LevelStem.NETHER) {
168+
} else if (instance.type().is(LevelStem.NETHER.location())) {
172169
this.environment = World.Environment.NETHER;
173-
} else if (instance.type() == LevelStem.END) {
170+
} else if (instance.type().is(LevelStem.END.location())) {
174171
this.environment = World.Environment.THE_END;
175172
} else {
176-
this.environment = World.Environment.CUSTOM;
173+
// Don't use CUSTOM; it's not even supported in Multiverse
174+
// this.environment = World.Environment.CUSTOM;
175+
this.environment = World.Environment.NORMAL;
177176
}
178177
// Data needed by getWorld() are all initialized for possible creating CraftWorld.
179178
// CraftBukkit start: select custom chunk generator

0 commit comments

Comments
 (0)