diff --git a/src/main/java/org/spongepowered/common/bridge/world/level/storage/ServerLevelDataBridge.java b/src/main/java/org/spongepowered/common/bridge/world/level/storage/ServerLevelDataBridge.java index 9780ca08df2..832f24b3199 100644 --- a/src/main/java/org/spongepowered/common/bridge/world/level/storage/ServerLevelDataBridge.java +++ b/src/main/java/org/spongepowered/common/bridge/world/level/storage/ServerLevelDataBridge.java @@ -38,6 +38,7 @@ import org.spongepowered.api.Sponge; import org.spongepowered.api.world.SerializationBehavior; import org.spongepowered.common.SpongeCommon; +import org.spongepowered.common.bridge.world.level.border.WorldBorderBridge; import org.spongepowered.common.world.server.SpongeServerLevelData; import org.spongepowered.common.world.server.SpongeWorldManager; @@ -127,6 +128,15 @@ public interface ServerLevelDataBridge { return Optional.empty(); } + default @Nullable WorldBorderBridge bridge$worldBorder() { + final ServerLevel level = this.bridge$level(); + if (level != null) { + return (WorldBorderBridge) level.getWorldBorder(); + } + + return null; + } + default void bridge$triggerViewDistanceLogic() { final ServerLevel level = this.bridge$level(); if (level != null) { diff --git a/src/main/java/org/spongepowered/common/data/provider/world/WorldPropertiesData.java b/src/main/java/org/spongepowered/common/data/provider/world/WorldPropertiesData.java index 2969efd9ec0..78f3519d419 100644 --- a/src/main/java/org/spongepowered/common/data/provider/world/WorldPropertiesData.java +++ b/src/main/java/org/spongepowered/common/data/provider/world/WorldPropertiesData.java @@ -35,7 +35,6 @@ import org.spongepowered.api.entity.living.player.gamemode.GameMode; import org.spongepowered.api.world.SerializationBehavior; import org.spongepowered.api.world.WorldType; -import org.spongepowered.api.world.border.WorldBorder; import org.spongepowered.api.world.difficulty.Difficulty; import org.spongepowered.api.world.generation.config.WorldGenerationConfig; import org.spongepowered.api.world.server.WorldArchetype; @@ -78,8 +77,6 @@ public static void register(final DataProviderRegistrator registrator) { .get(ServerLevelData::isAllowCommands) .create(Keys.INITIALIZED) .get(ServerLevelData::isInitialized) - .create(Keys.WORLD_BORDER) - .get(h -> (WorldBorder) (Object) h.getLegacyWorldBorderSettings().orElse(null)) .create(Keys.WEATHER) .get(SpongeWeather::of) .set(SpongeWeather::apply) @@ -100,6 +97,8 @@ public static void register(final DataProviderRegistrator registrator) { .get(ServerLevelDataBridge::bridge$loadOnStartup) .create(Keys.WORLD_ARCHETYPE_TYPE) .get(h -> (WorldArchetypeType) (Object) h.bridge$levelStem()) + .create(Keys.WORLD_BORDER) + .get(h -> h.bridge$worldBorder().bridge$asImmutable()) .asMutable(PrimaryLevelData.class) .create(Keys.WORLD_DIFFICULTY) .set((h, v) -> h.setDifficulty((net.minecraft.world.Difficulty) (Object) v)) diff --git a/src/main/java/org/spongepowered/common/world/server/SpongeWorldManager.java b/src/main/java/org/spongepowered/common/world/server/SpongeWorldManager.java index bde5675f5aa..bc9366c2314 100644 --- a/src/main/java/org/spongepowered/common/world/server/SpongeWorldManager.java +++ b/src/main/java/org/spongepowered/common/world/server/SpongeWorldManager.java @@ -933,6 +933,7 @@ private ServerLevel createLevel( // Ensure that the world border is registered. levelData.getLegacyWorldBorderSettings().ifPresent(world.getWorldBorder()::applySettings); + levelData.setLegacyWorldBorderSettings(Optional.empty()); PlatformHooks.INSTANCE.getWorldHooks().postLoadWorld(world); return world; } diff --git a/src/main/java/org/spongepowered/common/world/teleport/SpongeTeleportHelper.java b/src/main/java/org/spongepowered/common/world/teleport/SpongeTeleportHelper.java index 133a5af1c62..8388ba229da 100644 --- a/src/main/java/org/spongepowered/common/world/teleport/SpongeTeleportHelper.java +++ b/src/main/java/org/spongepowered/common/world/teleport/SpongeTeleportHelper.java @@ -73,7 +73,7 @@ public Optional findSafeLocation(ServerLocation location, int he private Stream getBlockLocations(ServerLocation worldLocation, int height, int width) { // We don't want to warp outside of the world border, so we want to check that we're within it. - final WorldBorder.Settings worldBorder = (WorldBorder.Settings) (Object) worldLocation.world().properties().worldBorder(); + final WorldBorder.Settings worldBorder = (WorldBorder.Settings) (Object) worldLocation.world().border(); final double radius = worldBorder.size() / 2.0D; int worldBorderMinX = GenericMath.floor(worldBorder.centerX() - radius); int worldBorderMinZ = GenericMath.floor(worldBorder.centerZ() - radius); diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/server/level/ServerLevelMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/server/level/ServerLevelMixin_API.java index 9adc9c0b625..dfce0c9ff0c 100644 --- a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/server/level/ServerLevelMixin_API.java +++ b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/server/level/ServerLevelMixin_API.java @@ -345,7 +345,7 @@ public WorldBorder setBorder(final WorldBorder border) { if (worldBorder == null) { return (WorldBorder) (Object) net.minecraft.world.level.border.WorldBorder.Settings.DEFAULT; } - this.serverLevelData.setLegacyWorldBorderSettings(Optional.of((net.minecraft.world.level.border.WorldBorder.Settings) (Object) border)); + return worldBorder; } diff --git a/src/mixins/java/org/spongepowered/common/mixin/core/server/level/ServerLevelMixin.java b/src/mixins/java/org/spongepowered/common/mixin/core/server/level/ServerLevelMixin.java index d2363c60a69..c243c175fae 100644 --- a/src/mixins/java/org/spongepowered/common/mixin/core/server/level/ServerLevelMixin.java +++ b/src/mixins/java/org/spongepowered/common/mixin/core/server/level/ServerLevelMixin.java @@ -63,7 +63,6 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.JukeboxBlockEntity; import net.minecraft.world.level.block.entity.TickingBlockEntity; -import net.minecraft.world.level.border.WorldBorder; import net.minecraft.world.level.dimension.DimensionType; import net.minecraft.world.level.dimension.LevelStem; import net.minecraft.world.level.dimension.end.EndDragonFight; @@ -375,9 +374,7 @@ public abstract class ServerLevelMixin extends LevelMixin implements ServerLevel if (behavior != SerializationBehavior.NONE) { original.call(self, flush); - // per-world WorldInfo/WorldBorder/BossBars - final var border = this.getWorldBorder(); - levelData.setLegacyWorldBorderSettings(Optional.of(new WorldBorder.Settings(border))); + // per-world WorldInfo/BossBars if (levelData instanceof WorldData worldData) { worldData.setCustomBossEvents(this.bridge$getBossBarManager().save(SpongeCommon.server().registryAccess())); this.bridge$getLevelSave().saveDataTag(SpongeCommon.server().registryAccess(), worldData, this.shadow$dimension() == Level.OVERWORLD ? SpongeCommon.server().getPlayerList().getSingleplayerData() : null); diff --git a/src/mixins/java/org/spongepowered/common/mixin/core/world/level/storage/DimensionDataStorageMixin.java b/src/mixins/java/org/spongepowered/common/mixin/core/world/level/storage/DimensionDataStorageMixin.java index 9f440bdaa14..bb5d3a67a99 100644 --- a/src/mixins/java/org/spongepowered/common/mixin/core/world/level/storage/DimensionDataStorageMixin.java +++ b/src/mixins/java/org/spongepowered/common/mixin/core/world/level/storage/DimensionDataStorageMixin.java @@ -57,7 +57,7 @@ public T readSpongeMapData( DataUtil.syncTagToData(dch); dch.data$setCompound(null); } - return null; + return result; } @Override diff --git a/src/test/java/org/spongepowered/common/world/border/WorldBorderTest.java b/src/test/java/org/spongepowered/common/world/border/WorldBorderTest.java new file mode 100644 index 00000000000..2cc37d67283 --- /dev/null +++ b/src/test/java/org/spongepowered/common/world/border/WorldBorderTest.java @@ -0,0 +1,74 @@ +/* + * This file is part of Sponge, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.common.world.border; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.spongepowered.api.Sponge; +import org.spongepowered.api.world.DefaultWorldKeys; +import org.spongepowered.api.world.border.WorldBorder; +import org.spongepowered.api.world.server.ServerWorld; + +public class WorldBorderTest { + + @Test + public void testBorderIsApplied() { + final ServerWorld world = Sponge.server().worldManager().world(DefaultWorldKeys.DEFAULT).get(); + final WorldBorder worldBorder = world.border(); + final WorldBorder border = WorldBorder.builder().center(1, 1).initialDiameter(1).build(); + + try { + world.setBorder(border); + + Assertions.assertEquals(border, world.border()); + } finally { + world.setBorder(worldBorder); + } + } + + @Test + public void testBorderIsWorldSpecific() { + final ServerWorld world = Sponge.server().worldManager().world(DefaultWorldKeys.DEFAULT).get(); + final ServerWorld nether = Sponge.server().worldManager().world(DefaultWorldKeys.THE_NETHER).get(); + + final WorldBorder worldBorder = world.border(); + final WorldBorder worldBorderNether = nether.border(); + + final WorldBorder border = WorldBorder.builder().center(1, 1).initialDiameter(1).build(); + final WorldBorder netherBorder = WorldBorder.builder().center(2, 2).initialDiameter(2).build(); + + try { + world.setBorder(border); + nether.setBorder(netherBorder); + + Assertions.assertEquals(border, world.border()); + Assertions.assertEquals(netherBorder, nether.border()); + } finally { + world.setBorder(worldBorder); + nether.setBorder(worldBorderNether); + } + } + +}