Merge branch 'release/levelborder/1.1.2' into main

Venatus247 · Nov 22, 2021 · 08ace55 · 08ace55
2 parents b5dc71f + d2ae221
commit 08ace55
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/LevelBorder/pom.xml b/LevelBorder/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>LevelBorder</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>

diff --git a/LevelBorder/src/main/java/de/venatus247/levelborder/LevelBorder.java b/LevelBorder/src/main/java/de/venatus247/levelborder/LevelBorder.java
@@ -84,6 +84,7 @@ public void onEnable() {
         registerCommands();
 
         prepareWorlds();
+        updateLevelAndExp(getLevel(), getExp());
     }
 
     @Override
@@ -151,7 +152,11 @@ public void updateLevelAndExp(int level, float exp) {
             players.setLevel(level);
         }
 
-        int newSize = level*borderConfig.getBorderLevelMultiplier() + 1;
+        int newSize = switch (level) {
+            case 0 -> 1;
+            default -> borderConfig.getBorderLevelMultiplier() == 1 ? level*borderConfig.getBorderLevelMultiplier() + 1 : level*borderConfig.getBorderLevelMultiplier();
+        };
+
         if(newSize != borderConfig.getCurrentBorderSize()) {
             updateBorder(newSize);
         }

diff --git a/LevelBorder/src/main/java/de/venatus247/levelborder/config/LevelBorderConfig.java b/LevelBorder/src/main/java/de/venatus247/levelborder/config/LevelBorderConfig.java
@@ -34,7 +34,7 @@ public boolean loadDefaults(boolean writeToFile) {
         Logger.getInstance().log("Loading default config");
         config.addDefault("border.currentSize", 1);
         config.addDefault("border.expandTime", 1);
-        config.addDefault("border.multiplier", 1);
+        config.addDefault("border.multiplier", 2);
         config.addDefault("level.level", 0);
         config.addDefault("level.exp", 0.0f);
         config.addDefault("world.overworld.name", "world");

diff --git a/LevelBorder/src/main/java/de/venatus247/levelborder/controllers/WorldBorderController.java b/LevelBorder/src/main/java/de/venatus247/levelborder/controllers/WorldBorderController.java
@@ -5,8 +5,6 @@
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
-import java.util.concurrent.TimeUnit;
-
 public class WorldBorderController {
 
     public void updateSizeToAll(int size, int borderExpandTime) {
@@ -24,7 +22,11 @@ public void setPlayerBorder(Player player, int size) {
     }
 
     private Location getWorldBorderCenter(Player player) {
-        return player.getWorld().getSpawnLocation();
+        Location spawnLocation = player.getWorld().getSpawnLocation();
+        spawnLocation.setX((double) spawnLocation.getBlockX() + 0.5);
+        spawnLocation.setZ((double) spawnLocation.getBlockZ() + 0.5);
+
+        return spawnLocation;
     }
 
 }
diff --git a/LevelBorder/src/main/resources/plugin.yml b/LevelBorder/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: LevelBorder
 author: VenatusSaw
-version: 1.11
+version: 1.12
 main: de.venatus247.levelborder.LevelBorder
 softdepend:
   - VUtils