def base can now be everywhere not just 0 0

YuToutCourt · Jul 12, 2022 · 02de7f1 · 02de7f1
1 parent df6a837
commit 02de7f1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/com/terrafunder/terrafunder/Command/StartCommand.java b/src/main/java/com/terrafunder/terrafunder/Command/StartCommand.java
@@ -101,8 +101,8 @@ private void tpTeam(){
         int x,z;
         for(Teams team : Teams.teams){
             if(!team.getName().equals("Defenseur")){
-                x = negativeOrNot(rand.nextInt((int)this.main.WORLD.getWorldBorder().getSize() / 2));
-                z = negativeOrNot(rand.nextInt((int)this.main.WORLD.getWorldBorder().getSize() / 2));
+                x = negativeOrNot(rand.nextInt((int)this.main.WORLD.getWorldBorder().getSize() / 2)) + (int)this.main.WORLD.getSpawnLocation().getX();
+                z = negativeOrNot(rand.nextInt((int)this.main.WORLD.getWorldBorder().getSize() / 2)) + (int)this.main.WORLD.getSpawnLocation().getZ();
                 if (firstTeam){
                     coordUsed[index][0] = x;
                     coordUsed[index][1] = z;
@@ -111,8 +111,8 @@ private void tpTeam(){
                 }
                 else {
                     while (!checkProximity(x,z,coordUsed)){
-                        x = negativeOrNot(rand.nextInt((int)this.main.WORLD.getWorldBorder().getSize() / 2));
-                        z = negativeOrNot(rand.nextInt((int)this.main.WORLD.getWorldBorder().getSize() / 2));
+                        x = negativeOrNot(rand.nextInt((int)this.main.WORLD.getWorldBorder().getSize() / 2)) + (int)this.main.WORLD.getSpawnLocation().getX();
+                        z = negativeOrNot(rand.nextInt((int)this.main.WORLD.getWorldBorder().getSize() / 2)) + (int)this.main.WORLD.getSpawnLocation().getZ();
                     }
                     coordUsed[index][0] = x;
                     coordUsed[index][1] = z;

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -3,7 +3,7 @@ Spawn: # Spawn coordinates ✔️
   y: 250 # int y coordinate
   z: 0   # int z coordinate
 
-SpawnDef: # Spawn coordinates for the defenseur
+SpawnDef: # Spawn coordinates for the defender
   x: 0   # int x coordinate
   z: 0   # int z coordinate
 
@@ -27,7 +27,7 @@ CutClean: true # Enable or not the Cut Clean scenario (autosmelting items) ✔
 Teams: #✔️
   TeamChat: true # Enable or not team chat
   FriendlyFire : false # Enable or not the friendlyfire
-  Teams: # color,name,data - splitted by comma (The "Defenseur" team have to have this name = "Defenseur")
+  Teams: # color,name,data - splitted by comma (The "Defender" team have to have this name = "Defenseur")
     - "GOLD,Orange,14"
     - "YELLOW,Yellow,11"
     - "DARK_GREEN,Dark Green,2"
@@ -40,7 +40,7 @@ Teams: #✔️
     - "GRAY,Gray,8"
 
 Invicibility: 30 # Invicibility time at the start of the game, in seconds ✔️
-TimeBeforePvp: 3 # Time in days before PVP is enable (a day if 20 minutes) ✔️
+TimeBeforePvp: 3 # Time in days before PVP is enable (a day, 20 minutes) ✔️
 
 Border: #✔️
   StartSize: 2000 # Initial size (width) of the border