From 276a9c37fb93542d0a83a1c440c6963975222f58 Mon Sep 17 00:00:00 2001
From: lixfel <f.weinmann@gmx.de>
Date: Sat, 13 Apr 2019 22:04:08 +0200
Subject: [PATCH] Small Changes (Positioning)

---
 .../yaruma/fightsystem/fight/FightTeam.java   | 10 ++----
 src/me/yaruma/fightsystem/utils/Config.java   | 31 +++++++------------
 2 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/src/me/yaruma/fightsystem/fight/FightTeam.java b/src/me/yaruma/fightsystem/fight/FightTeam.java
index f0e8658..51a4f17 100644
--- a/src/me/yaruma/fightsystem/fight/FightTeam.java
+++ b/src/me/yaruma/fightsystem/fight/FightTeam.java
@@ -145,15 +145,9 @@ public class FightTeam {
         AffineTransform aT = new AffineTransform();
         if(rotate){
             aT = aT.rotateY(180);
-            v = paste.add(dimensions.getX()/2, 0, dimensions.getZ()/2).subtract(offset.multiply(-1, 1, -1));
-            if(Config.SchemsizeX % 2 == 0){
-                v = v.add(-1, 0, 0);
-            }
-            if(Config.SchemsizeZ % 2 == 0){
-                v = v.add(0, 0, -1);
-            }
+            v = paste.add(dimensions.getX()/2 + dimensions.getX()%2, 0, dimensions.getZ()/2 + dimensions.getZ()%2).subtract(offset.multiply(-1, 1, -1)).subtract(1, 0, 1);
         }else{
-            v = paste.subtract(dimensions.getX()/2, 0, dimensions.getZ()/2).subtract(offset);
+            v = paste.subtract(dimensions.getX()/2 - dimensions.getX()%2, 0, dimensions.getZ()/2 - dimensions.getZ()%2).subtract(offset);
         }
         schem.paste(w, v, false, true, aT).flushQueue();
         teleportToSpawn();
diff --git a/src/me/yaruma/fightsystem/utils/Config.java b/src/me/yaruma/fightsystem/utils/Config.java
index 5dbd0bd..344107b 100644
--- a/src/me/yaruma/fightsystem/utils/Config.java
+++ b/src/me/yaruma/fightsystem/utils/Config.java
@@ -70,12 +70,6 @@ public class Config {
     public static Location TeamRedSpawn;
     public static Location SpecSpawn;
 
-    public static int TeamBluePasteX;
-    public static int TeamBluePasteY;
-    public static int TeamBluePasteZ;
-    public static int TeamRedPasteX;
-    public static int TeamRedPasteY;
-    public static int TeamRedPasteZ;
     public static Vector TeamBluePaste;
     public static Vector TeamRedPaste;
 
@@ -158,24 +152,21 @@ public class Config {
         TeamRedCornerY = TeamBluetoReddistanceY + TeamBlueCornerY;
         TeamRedCornerZ = TeamBluetoReddistanceZ + TeamBlueCornerZ;
 
-        TeamBluePasteX = TeamBlueCornerX + SchemsizeX/2;
-        TeamBluePasteY = TeamBlueCornerY;
-        TeamBluePasteZ = TeamBlueCornerZ + SchemsizeZ/2;
+        int teamBluePasteX = TeamBlueCornerX + SchemsizeX / 2;
+        int teamBluePasteZ = TeamBlueCornerZ + SchemsizeZ / 2;
+        int teamRedPasteX = teamBluePasteX + TeamBluetoReddistanceX;
+        int teamRedPasteZ = teamBluePasteZ + TeamBluetoReddistanceZ;
 
-        TeamBluePaste = new Vector(TeamBlueCornerX + SchemsizeX/2, TeamBlueCornerY, TeamBlueCornerZ + SchemsizeZ/2);
-        TeamRedPaste = new Vector(TeamRedCornerX + SchemsizeX/2, TeamRedCornerY, TeamRedCornerZ + SchemsizeZ/2);
-
-        TeamRedPasteX = TeamBluePasteX + TeamBluetoReddistanceX;
-        TeamRedPasteY = TeamBluePasteY + TeamBluetoReddistanceY;
-        TeamRedPasteZ = TeamBluePasteZ + TeamBluetoReddistanceZ;
+        TeamBluePaste = new Vector(teamBluePasteX, TeamBlueCornerY, teamBluePasteZ);
+        TeamRedPaste = new Vector(teamRedPasteX, TeamRedCornerY, teamRedPasteZ);
 
         World world = Bukkit.getWorlds().get(0);
-        TeamBlueSpawn = new Location(world, TeamBluePasteX + 0.5, TeamBluePasteY + SchemsizeY, TeamBluePasteZ + 0.5);
-        TeamRedSpawn = new Location(world, TeamRedPasteX + 0.5, TeamRedPasteY + SchemsizeY, TeamRedPasteZ + 0.5);
+        TeamBlueSpawn = new Location(world, teamBluePasteX + 0.5, TeamBlueCornerY + SchemsizeY, teamBluePasteZ + 0.5);
+        TeamRedSpawn = new Location(world, teamRedPasteX + 0.5, TeamRedCornerY + SchemsizeY, teamRedPasteZ + 0.5);
         SpecSpawn = new Location(world,
-                TeamBluePasteX + TeamBluetoReddistanceX/2,
-                TeamBluePasteY + TeamBluetoReddistanceY/2 + SchemsizeY/2,
-                TeamBluePasteZ + TeamBluetoReddistanceZ/2);
+                teamBluePasteX + TeamBluetoReddistanceX/2,
+                TeamBlueCornerY + TeamBluetoReddistanceY/2 + SchemsizeY/2,
+                teamBluePasteZ + TeamBluetoReddistanceZ/2);
 
         if(TeamBluetoReddistanceX > 0){
             ArenaMinX = TeamBlueCornerX - Schem2BorderX;