diff --git a/pom.xml b/pom.xml index 11937cf..8b82624 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ -LOCAL - 1.0.1 + 1.0.2 bentobox-world diff --git a/src/main/java/world/bentobox/stranger/Settings.java b/src/main/java/world/bentobox/stranger/Settings.java index 2709c4e..34e5d00 100644 --- a/src/main/java/world/bentobox/stranger/Settings.java +++ b/src/main/java/world/bentobox/stranger/Settings.java @@ -85,9 +85,9 @@ public class Settings implements WorldSettings { @ConfigEntry(path = "world.manual-border-size") private boolean manualBorderSize = false; - @ConfigComment("Global border size increase per online player in blocks.") + @ConfigComment("Global border size increase per online player in blocks. Radius size.") @ConfigEntry(path = "world.barrier-increase-blocks") - private int barrierIncreaseBlocks = 160; + private int barrierIncreaseBlocks = 320; @ConfigComment("Global border reduction speed. How fast the global border will shrink if it needs to do so.") @ConfigComment("Per block reduction time in seconds.") diff --git a/src/main/java/world/bentobox/stranger/StrangerRealms.java b/src/main/java/world/bentobox/stranger/StrangerRealms.java index 9a65757..a236794 100644 --- a/src/main/java/world/bentobox/stranger/StrangerRealms.java +++ b/src/main/java/world/bentobox/stranger/StrangerRealms.java @@ -31,6 +31,7 @@ import world.bentobox.bentobox.api.configuration.WorldSettings; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.stranger.border.BorderShower; import world.bentobox.stranger.border.BorderType; import world.bentobox.stranger.border.PerPlayerBorderProxy; import world.bentobox.stranger.border.ShowBarrier; @@ -42,7 +43,6 @@ import world.bentobox.stranger.generator.NetherBiomeProvider; import world.bentobox.stranger.generator.NetherChunkMaker; import world.bentobox.stranger.generator.NetherChunks; -import world.bentobox.stranger.listeners.BorderShower; import world.bentobox.stranger.listeners.NetherRedstoneListener; import world.bentobox.stranger.listeners.PlayerListener; import world.bentobox.stranger.listeners.TeamListener; diff --git a/src/main/java/world/bentobox/stranger/listeners/BorderShower.java b/src/main/java/world/bentobox/stranger/border/BorderShower.java similarity index 95% rename from src/main/java/world/bentobox/stranger/listeners/BorderShower.java rename to src/main/java/world/bentobox/stranger/border/BorderShower.java index a6f2902..7500d2b 100644 --- a/src/main/java/world/bentobox/stranger/listeners/BorderShower.java +++ b/src/main/java/world/bentobox/stranger/border/BorderShower.java @@ -1,4 +1,4 @@ -package world.bentobox.stranger.listeners; +package world.bentobox.stranger.border; import org.bukkit.entity.Player; diff --git a/src/main/java/world/bentobox/stranger/border/PerPlayerBorderProxy.java b/src/main/java/world/bentobox/stranger/border/PerPlayerBorderProxy.java index 62824ab..95b0dad 100644 --- a/src/main/java/world/bentobox/stranger/border/PerPlayerBorderProxy.java +++ b/src/main/java/world/bentobox/stranger/border/PerPlayerBorderProxy.java @@ -4,7 +4,6 @@ import world.bentobox.bentobox.api.user.User; import world.bentobox.stranger.StrangerRealms; -import world.bentobox.stranger.listeners.BorderShower; public final class PerPlayerBorderProxy implements BorderShower { diff --git a/src/main/java/world/bentobox/stranger/border/ShowBarrier.java b/src/main/java/world/bentobox/stranger/border/ShowBarrier.java index 6e59678..4bd5af4 100644 --- a/src/main/java/world/bentobox/stranger/border/ShowBarrier.java +++ b/src/main/java/world/bentobox/stranger/border/ShowBarrier.java @@ -23,7 +23,6 @@ import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.util.Util; import world.bentobox.stranger.StrangerRealms; -import world.bentobox.stranger.listeners.BorderShower; /** * diff --git a/src/main/java/world/bentobox/stranger/border/ShowWorldBorder.java b/src/main/java/world/bentobox/stranger/border/ShowWorldBorder.java index 925b8ff..b4ee760 100644 --- a/src/main/java/world/bentobox/stranger/border/ShowWorldBorder.java +++ b/src/main/java/world/bentobox/stranger/border/ShowWorldBorder.java @@ -15,7 +15,6 @@ import world.bentobox.bentobox.util.Util; import world.bentobox.bentobox.util.teleport.SafeSpotTeleport; import world.bentobox.stranger.StrangerRealms; -import world.bentobox.stranger.listeners.BorderShower; /** * Show a border using Paper's WorldBorder API @@ -35,12 +34,13 @@ public void showBorder(Player player) { if (addon.getSettings().isDisableWorldBorder() || !Objects.requireNonNull(User.getInstance(player)).getMetaData(BORDER_STATE_META_DATA).map(MetaDataValue::asBoolean).orElse(true)) { return; } - addon.getIslands().getIslandAt(player.getLocation()).ifPresentOrElse(island -> { - + addon.getIslands().getIslandAt(player.getLocation()) + .filter(i -> !i.isSpawn()) // Don't show border of the spawn claim itself + .ifPresentOrElse(island -> { Location l = island.getProtectionCenter().toVector().toLocation(player.getWorld()); // Check if the claim is entirely within the world barrier Location center = Objects.requireNonNullElse(addon.getIslands().getSpawnPoint(player.getWorld()), player.getWorld().getSpawnLocation()); - double dist = addon.getBorderSize() / 2D; + double dist = addon.getBorderSize(); BoundingBox worldBB = BoundingBox.of(center.toVector(), dist, dist, dist); if (worldBB.contains(island.getBoundingBox())) { showWorldBarrier(player); diff --git a/src/main/java/world/bentobox/stranger/listeners/PlayerListener.java b/src/main/java/world/bentobox/stranger/listeners/PlayerListener.java index eabd824..6548591 100644 --- a/src/main/java/world/bentobox/stranger/listeners/PlayerListener.java +++ b/src/main/java/world/bentobox/stranger/listeners/PlayerListener.java @@ -38,6 +38,7 @@ import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.util.Util; import world.bentobox.stranger.StrangerRealms; +import world.bentobox.stranger.border.BorderShower; /** * Listens for player events and manages the border visualization and player containment. diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 5f3a39b..212b63f 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -34,7 +34,7 @@ world: # Use manual world border sizing # Set to true to overide the automatic world border sizing based on the number of online players. manual-border-size: false - # Global border size increase per online player in blocks. + # Global border size increase per online player in blocks. Radius size. barrier-increase-blocks: 320 # Global border reduction speed. How fast the global border will shrink if it needs to do so. # Per block reduction time in seconds.