From ee8e8113cb6d6014cc361f3769d50728f48ae1a3 Mon Sep 17 00:00:00 2001 From: jojo Date: Fri, 22 May 2020 17:16:19 +0200 Subject: [PATCH 01/13] Add FacingEnemy Rotation --- .../src/de/steamwar/fightsystem/Config.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/FightSystem_API/src/de/steamwar/fightsystem/Config.java b/FightSystem_API/src/de/steamwar/fightsystem/Config.java index ed64f4d..cf603f7 100644 --- a/FightSystem_API/src/de/steamwar/fightsystem/Config.java +++ b/FightSystem_API/src/de/steamwar/fightsystem/Config.java @@ -250,14 +250,25 @@ public class Config { TeamRedPasteZ = TeamBluePasteZ + TeamBluetoReddistanceZ; World world = Bukkit.getWorlds().get(0); + double yaw = Math.atan2(TeamBluetoReddistanceZ, TeamBluetoReddistanceX); + double pitch = Math.atan2(Math.sqrt(TeamBluetoReddistanceZ * TeamBluetoReddistanceZ + TeamBluetoReddistanceX * TeamBluetoReddistanceX), TeamBluetoReddistanceY) + Math.PI; + double yawInverted = ((yaw + 90 + 180) * Math.PI) / 180; + double pitchInverted = ((90 - pitch) * Math.PI) / 180; + TeamBlueSpawn = new Location(world, TeamBluePasteX + 0.5 + teamBlueSpawnOffsetX, TeamBlueCornerY + 0.5 + teamBlueSpawnOffsetY, TeamBluePasteZ + 0.5 + teamBlueSpawnOffsetZ); + TeamBlueSpawn.setYaw((float)yaw); + TeamBlueSpawn.setPitch((float)pitch); + TeamRedSpawn = new Location(world, TeamRedPasteX + 0.5 - teamBlueSpawnOffsetX, TeamRedCornerY + 0.5 + teamBlueSpawnOffsetY, TeamRedPasteZ + 0.5 - teamBlueSpawnOffsetZ); + TeamRedSpawn.setYaw((float)yawInverted); + TeamRedSpawn.setPitch((float)pitchInverted); + SpecSpawn = new Location(world, TeamBluePasteX + TeamBluetoReddistanceX/2.0, TeamBlueCornerY + TeamBluetoReddistanceY/2.0 + SchemsizeY/2.0, -- 2.39.2 From 3ed914731f7699c7ac806f647fb008c435e0b680 Mon Sep 17 00:00:00 2001 From: jojo Date: Fri, 22 May 2020 17:40:15 +0200 Subject: [PATCH 02/13] Add FacingEnemy Math.toDegrees() --- FightSystem_API/src/de/steamwar/fightsystem/Config.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/FightSystem_API/src/de/steamwar/fightsystem/Config.java b/FightSystem_API/src/de/steamwar/fightsystem/Config.java index cf603f7..50d3fc2 100644 --- a/FightSystem_API/src/de/steamwar/fightsystem/Config.java +++ b/FightSystem_API/src/de/steamwar/fightsystem/Config.java @@ -250,10 +250,10 @@ public class Config { TeamRedPasteZ = TeamBluePasteZ + TeamBluetoReddistanceZ; World world = Bukkit.getWorlds().get(0); - double yaw = Math.atan2(TeamBluetoReddistanceZ, TeamBluetoReddistanceX); - double pitch = Math.atan2(Math.sqrt(TeamBluetoReddistanceZ * TeamBluetoReddistanceZ + TeamBluetoReddistanceX * TeamBluetoReddistanceX), TeamBluetoReddistanceY) + Math.PI; - double yawInverted = ((yaw + 90 + 180) * Math.PI) / 180; - double pitchInverted = ((90 - pitch) * Math.PI) / 180; + double yaw = Math.toDegrees(Math.atan2(TeamBluetoReddistanceZ, TeamBluetoReddistanceX)); + double pitch = Math.toDegrees(Math.atan2(Math.sqrt(TeamBluetoReddistanceZ * TeamBluetoReddistanceZ + TeamBluetoReddistanceX * TeamBluetoReddistanceX), TeamBluetoReddistanceY) + Math.PI); + double yawInverted = Math.toDegrees(((yaw + 90 + 180) * Math.PI) / 180); + double pitchInverted = Math.toDegrees(((90 - pitch) * Math.PI) / 180); TeamBlueSpawn = new Location(world, TeamBluePasteX + 0.5 + teamBlueSpawnOffsetX, -- 2.39.2 From 28823ce382c277e99c5e5baee82ef70af0afb469 Mon Sep 17 00:00:00 2001 From: jojo Date: Fri, 22 May 2020 17:41:56 +0200 Subject: [PATCH 03/13] Remove FacingEnemy Math.toDegrees() --- FightSystem_API/src/de/steamwar/fightsystem/Config.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FightSystem_API/src/de/steamwar/fightsystem/Config.java b/FightSystem_API/src/de/steamwar/fightsystem/Config.java index 50d3fc2..20d5cc7 100644 --- a/FightSystem_API/src/de/steamwar/fightsystem/Config.java +++ b/FightSystem_API/src/de/steamwar/fightsystem/Config.java @@ -252,8 +252,8 @@ public class Config { World world = Bukkit.getWorlds().get(0); double yaw = Math.toDegrees(Math.atan2(TeamBluetoReddistanceZ, TeamBluetoReddistanceX)); double pitch = Math.toDegrees(Math.atan2(Math.sqrt(TeamBluetoReddistanceZ * TeamBluetoReddistanceZ + TeamBluetoReddistanceX * TeamBluetoReddistanceX), TeamBluetoReddistanceY) + Math.PI); - double yawInverted = Math.toDegrees(((yaw + 90 + 180) * Math.PI) / 180); - double pitchInverted = Math.toDegrees(((90 - pitch) * Math.PI) / 180); + double yawInverted = ((yaw + 90 + 180) * Math.PI) / 180; + double pitchInverted = ((90 - pitch) * Math.PI) / 180; TeamBlueSpawn = new Location(world, TeamBluePasteX + 0.5 + teamBlueSpawnOffsetX, -- 2.39.2 From 7e4825472f433d4d7e6116f94c219d05642bc418 Mon Sep 17 00:00:00 2001 From: jojo Date: Fri, 22 May 2020 17:46:03 +0200 Subject: [PATCH 04/13] Remove FacingEnemy Math.PI Add FacingEnemy 180 --- FightSystem_API/src/de/steamwar/fightsystem/Config.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FightSystem_API/src/de/steamwar/fightsystem/Config.java b/FightSystem_API/src/de/steamwar/fightsystem/Config.java index 20d5cc7..5aae3ab 100644 --- a/FightSystem_API/src/de/steamwar/fightsystem/Config.java +++ b/FightSystem_API/src/de/steamwar/fightsystem/Config.java @@ -252,8 +252,8 @@ public class Config { World world = Bukkit.getWorlds().get(0); double yaw = Math.toDegrees(Math.atan2(TeamBluetoReddistanceZ, TeamBluetoReddistanceX)); double pitch = Math.toDegrees(Math.atan2(Math.sqrt(TeamBluetoReddistanceZ * TeamBluetoReddistanceZ + TeamBluetoReddistanceX * TeamBluetoReddistanceX), TeamBluetoReddistanceY) + Math.PI); - double yawInverted = ((yaw + 90 + 180) * Math.PI) / 180; - double pitchInverted = ((90 - pitch) * Math.PI) / 180; + double yawInverted = ((yaw + 90 + 180) * 180) / 180; + double pitchInverted = ((90 - pitch) * 180) / 180; TeamBlueSpawn = new Location(world, TeamBluePasteX + 0.5 + teamBlueSpawnOffsetX, -- 2.39.2 From 54c4bb4e6388a3bc6f35ddbad35f633bac120a49 Mon Sep 17 00:00:00 2001 From: jojo Date: Fri, 22 May 2020 17:52:32 +0200 Subject: [PATCH 05/13] Add FacingEnemy Blue Red switch --- .../src/de/steamwar/fightsystem/Config.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/FightSystem_API/src/de/steamwar/fightsystem/Config.java b/FightSystem_API/src/de/steamwar/fightsystem/Config.java index 5aae3ab..571800c 100644 --- a/FightSystem_API/src/de/steamwar/fightsystem/Config.java +++ b/FightSystem_API/src/de/steamwar/fightsystem/Config.java @@ -251,23 +251,25 @@ public class Config { World world = Bukkit.getWorlds().get(0); double yaw = Math.toDegrees(Math.atan2(TeamBluetoReddistanceZ, TeamBluetoReddistanceX)); - double pitch = Math.toDegrees(Math.atan2(Math.sqrt(TeamBluetoReddistanceZ * TeamBluetoReddistanceZ + TeamBluetoReddistanceX * TeamBluetoReddistanceX), TeamBluetoReddistanceY) + Math.PI); - double yawInverted = ((yaw + 90 + 180) * 180) / 180; + double pitch = Math.toDegrees(Math.atan2(Math.sqrt(TeamBluetoReddistanceZ * TeamBluetoReddistanceZ + TeamBluetoReddistanceX * TeamBluetoReddistanceX), TeamBluetoReddistanceY)); + double yawInverted = ((yaw + 180) * 180) / 180; double pitchInverted = ((90 - pitch) * 180) / 180; TeamBlueSpawn = new Location(world, TeamBluePasteX + 0.5 + teamBlueSpawnOffsetX, TeamBlueCornerY + 0.5 + teamBlueSpawnOffsetY, TeamBluePasteZ + 0.5 + teamBlueSpawnOffsetZ); - TeamBlueSpawn.setYaw((float)yaw); - TeamBlueSpawn.setPitch((float)pitch); TeamRedSpawn = new Location(world, TeamRedPasteX + 0.5 - teamBlueSpawnOffsetX, TeamRedCornerY + 0.5 + teamBlueSpawnOffsetY, TeamRedPasteZ + 0.5 - teamBlueSpawnOffsetZ); - TeamRedSpawn.setYaw((float)yawInverted); - TeamRedSpawn.setPitch((float)pitchInverted); + + TeamBlueSpawn.setYaw((float)yawInverted); + TeamBlueSpawn.setPitch((float)pitchInverted); + + TeamRedSpawn.setYaw((float)yaw); + TeamRedSpawn.setPitch((float)pitch); SpecSpawn = new Location(world, TeamBluePasteX + TeamBluetoReddistanceX/2.0, -- 2.39.2 From 582aeea8406e445674f942a5a7d88bc191596bce Mon Sep 17 00:00:00 2001 From: jojo Date: Fri, 22 May 2020 17:59:57 +0200 Subject: [PATCH 06/13] Fix yaw --- FightSystem_API/src/de/steamwar/fightsystem/Config.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FightSystem_API/src/de/steamwar/fightsystem/Config.java b/FightSystem_API/src/de/steamwar/fightsystem/Config.java index 571800c..78e91a8 100644 --- a/FightSystem_API/src/de/steamwar/fightsystem/Config.java +++ b/FightSystem_API/src/de/steamwar/fightsystem/Config.java @@ -250,7 +250,7 @@ public class Config { TeamRedPasteZ = TeamBluePasteZ + TeamBluetoReddistanceZ; World world = Bukkit.getWorlds().get(0); - double yaw = Math.toDegrees(Math.atan2(TeamBluetoReddistanceZ, TeamBluetoReddistanceX)); + double yaw = Math.toDegrees(Math.atan2(TeamBluetoReddistanceZ, TeamBluetoReddistanceX) + Math.PI / 2); double pitch = Math.toDegrees(Math.atan2(Math.sqrt(TeamBluetoReddistanceZ * TeamBluetoReddistanceZ + TeamBluetoReddistanceX * TeamBluetoReddistanceX), TeamBluetoReddistanceY)); double yawInverted = ((yaw + 180) * 180) / 180; double pitchInverted = ((90 - pitch) * 180) / 180; -- 2.39.2 From b800bdad29af167627834bf444b674d4276292da Mon Sep 17 00:00:00 2001 From: jojo Date: Fri, 22 May 2020 23:16:26 +0200 Subject: [PATCH 07/13] Add Pitch/Yaw calculation with Vector --- .../src/de/steamwar/fightsystem/Config.java | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/FightSystem_API/src/de/steamwar/fightsystem/Config.java b/FightSystem_API/src/de/steamwar/fightsystem/Config.java index 78e91a8..13a2da8 100644 --- a/FightSystem_API/src/de/steamwar/fightsystem/Config.java +++ b/FightSystem_API/src/de/steamwar/fightsystem/Config.java @@ -9,6 +9,7 @@ import org.bukkit.World; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.util.Vector; import java.io.File; import java.util.*; @@ -250,10 +251,10 @@ public class Config { TeamRedPasteZ = TeamBluePasteZ + TeamBluetoReddistanceZ; World world = Bukkit.getWorlds().get(0); - double yaw = Math.toDegrees(Math.atan2(TeamBluetoReddistanceZ, TeamBluetoReddistanceX) + Math.PI / 2); - double pitch = Math.toDegrees(Math.atan2(Math.sqrt(TeamBluetoReddistanceZ * TeamBluetoReddistanceZ + TeamBluetoReddistanceX * TeamBluetoReddistanceX), TeamBluetoReddistanceY)); - double yawInverted = ((yaw + 180) * 180) / 180; - double pitchInverted = ((90 - pitch) * 180) / 180; + //double yaw = Math.toDegrees(Math.atan2(TeamBluetoReddistanceZ, TeamBluetoReddistanceX) + Math.PI / 2); + //double pitch = Math.toDegrees(Math.atan2(Math.sqrt(TeamBluetoReddistanceZ * TeamBluetoReddistanceZ + TeamBluetoReddistanceX * TeamBluetoReddistanceX), TeamBluetoReddistanceY)); + //double yawInverted = yaw + 180; + //double pitchInverted = ((90 - pitch) * 180) / 180; TeamBlueSpawn = new Location(world, TeamBluePasteX + 0.5 + teamBlueSpawnOffsetX, @@ -265,11 +266,17 @@ public class Config { TeamRedCornerY + 0.5 + teamBlueSpawnOffsetY, TeamRedPasteZ + 0.5 - teamBlueSpawnOffsetZ); - TeamBlueSpawn.setYaw((float)yawInverted); - TeamBlueSpawn.setPitch((float)pitchInverted); + Vector v1 = TeamBlueSpawn.toVector().subtract(TeamRedSpawn.toVector()); + double pitch = v1.angle(v1.clone().setY(0)); + double yaw = v1.clone().setY(0).angle(new Vector(1, 0, 0)); + double pitchInverted = pitch * -1; + double yawInverted = yaw + 180; - TeamRedSpawn.setYaw((float)yaw); - TeamRedSpawn.setPitch((float)pitch); + TeamBlueSpawn.setYaw((float) yawInverted); + TeamBlueSpawn.setPitch((float) pitchInverted); + + TeamRedSpawn.setYaw((float) yaw); + TeamRedSpawn.setPitch((float) pitch); SpecSpawn = new Location(world, TeamBluePasteX + TeamBluetoReddistanceX/2.0, -- 2.39.2 From be0f3728b5db6238deb9bde5e0eb723dcb662a91 Mon Sep 17 00:00:00 2001 From: jojo Date: Fri, 22 May 2020 23:44:58 +0200 Subject: [PATCH 08/13] Add Pitch/Yaw calculation with Vector --- FightSystem_API/src/de/steamwar/fightsystem/Config.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/FightSystem_API/src/de/steamwar/fightsystem/Config.java b/FightSystem_API/src/de/steamwar/fightsystem/Config.java index 13a2da8..e8ec1f6 100644 --- a/FightSystem_API/src/de/steamwar/fightsystem/Config.java +++ b/FightSystem_API/src/de/steamwar/fightsystem/Config.java @@ -272,11 +272,11 @@ public class Config { double pitchInverted = pitch * -1; double yawInverted = yaw + 180; - TeamBlueSpawn.setYaw((float) yawInverted); - TeamBlueSpawn.setPitch((float) pitchInverted); + TeamBlueSpawn.setYaw((float) yaw); + TeamBlueSpawn.setPitch((float) pitch); - TeamRedSpawn.setYaw((float) yaw); - TeamRedSpawn.setPitch((float) pitch); + TeamRedSpawn.setYaw((float) yawInverted); + TeamRedSpawn.setPitch((float) pitchInverted); SpecSpawn = new Location(world, TeamBluePasteX + TeamBluetoReddistanceX/2.0, -- 2.39.2 From a20503b543dc6eef05002a19952cf92d38f53fa3 Mon Sep 17 00:00:00 2001 From: jojo Date: Sat, 23 May 2020 12:27:08 +0200 Subject: [PATCH 09/13] Add Pitch/Yaw Math.toDegrees() --- FightSystem_API/src/de/steamwar/fightsystem/Config.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FightSystem_API/src/de/steamwar/fightsystem/Config.java b/FightSystem_API/src/de/steamwar/fightsystem/Config.java index e8ec1f6..6028490 100644 --- a/FightSystem_API/src/de/steamwar/fightsystem/Config.java +++ b/FightSystem_API/src/de/steamwar/fightsystem/Config.java @@ -267,8 +267,8 @@ public class Config { TeamRedPasteZ + 0.5 - teamBlueSpawnOffsetZ); Vector v1 = TeamBlueSpawn.toVector().subtract(TeamRedSpawn.toVector()); - double pitch = v1.angle(v1.clone().setY(0)); - double yaw = v1.clone().setY(0).angle(new Vector(1, 0, 0)); + double pitch = Math.toDegrees(v1.angle(v1.clone().setY(0))); + double yaw = Math.toDegrees(v1.clone().setY(0).angle(new Vector(1, 0, 0))); double pitchInverted = pitch * -1; double yawInverted = yaw + 180; -- 2.39.2 From d1820d9e5b2b964bfb5bed226781f66b673bb608 Mon Sep 17 00:00:00 2001 From: jojo Date: Sat, 23 May 2020 12:42:11 +0200 Subject: [PATCH 10/13] Add Pitch/Yaw Vector Fix --- FightSystem_API/src/de/steamwar/fightsystem/Config.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FightSystem_API/src/de/steamwar/fightsystem/Config.java b/FightSystem_API/src/de/steamwar/fightsystem/Config.java index 6028490..0b1e83f 100644 --- a/FightSystem_API/src/de/steamwar/fightsystem/Config.java +++ b/FightSystem_API/src/de/steamwar/fightsystem/Config.java @@ -268,7 +268,7 @@ public class Config { Vector v1 = TeamBlueSpawn.toVector().subtract(TeamRedSpawn.toVector()); double pitch = Math.toDegrees(v1.angle(v1.clone().setY(0))); - double yaw = Math.toDegrees(v1.clone().setY(0).angle(new Vector(1, 0, 0))); + double yaw = Math.toDegrees(v1.clone().setY(0).angle(new Vector(0, 0, 1))); double pitchInverted = pitch * -1; double yawInverted = yaw + 180; -- 2.39.2 From c54ddbb60a91d38087f70e43056e8eb5f41bf8de Mon Sep 17 00:00:00 2001 From: jojo Date: Sat, 23 May 2020 12:46:36 +0200 Subject: [PATCH 11/13] Add Pitch/Yaw Vector Fix --- FightSystem_API/src/de/steamwar/fightsystem/Config.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FightSystem_API/src/de/steamwar/fightsystem/Config.java b/FightSystem_API/src/de/steamwar/fightsystem/Config.java index 0b1e83f..0464811 100644 --- a/FightSystem_API/src/de/steamwar/fightsystem/Config.java +++ b/FightSystem_API/src/de/steamwar/fightsystem/Config.java @@ -268,7 +268,7 @@ public class Config { Vector v1 = TeamBlueSpawn.toVector().subtract(TeamRedSpawn.toVector()); double pitch = Math.toDegrees(v1.angle(v1.clone().setY(0))); - double yaw = Math.toDegrees(v1.clone().setY(0).angle(new Vector(0, 0, 1))); + double yaw = Math.toDegrees(v1.clone().setY(0).angle(new Vector(0, 0, -1))); double pitchInverted = pitch * -1; double yawInverted = yaw + 180; -- 2.39.2 From c1d62e5e377d3523b649db5e226b2bfb336ab501 Mon Sep 17 00:00:00 2001 From: jojo Date: Sat, 23 May 2020 12:50:55 +0200 Subject: [PATCH 12/13] Add Pitch/Yaw Vector Fix --- FightSystem_API/src/de/steamwar/fightsystem/Config.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/FightSystem_API/src/de/steamwar/fightsystem/Config.java b/FightSystem_API/src/de/steamwar/fightsystem/Config.java index 0464811..5e53d69 100644 --- a/FightSystem_API/src/de/steamwar/fightsystem/Config.java +++ b/FightSystem_API/src/de/steamwar/fightsystem/Config.java @@ -268,14 +268,14 @@ public class Config { Vector v1 = TeamBlueSpawn.toVector().subtract(TeamRedSpawn.toVector()); double pitch = Math.toDegrees(v1.angle(v1.clone().setY(0))); - double yaw = Math.toDegrees(v1.clone().setY(0).angle(new Vector(0, 0, -1))); + double yaw = Math.toDegrees(v1.clone().setY(0).angle(new Vector(0, 0, 1))); double pitchInverted = pitch * -1; double yawInverted = yaw + 180; - TeamBlueSpawn.setYaw((float) yaw); + TeamBlueSpawn.setYaw((float) yawInverted); TeamBlueSpawn.setPitch((float) pitch); - TeamRedSpawn.setYaw((float) yawInverted); + TeamRedSpawn.setYaw((float) yaw); TeamRedSpawn.setPitch((float) pitchInverted); SpecSpawn = new Location(world, -- 2.39.2 From 99fdf1abdbd7222e2debfa57014a73e164a9b499 Mon Sep 17 00:00:00 2001 From: jojo Date: Sat, 23 May 2020 13:07:28 +0200 Subject: [PATCH 13/13] Add Pitch/Yaw Vector Fix --- FightSystem_API/src/de/steamwar/fightsystem/Config.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/FightSystem_API/src/de/steamwar/fightsystem/Config.java b/FightSystem_API/src/de/steamwar/fightsystem/Config.java index 5e53d69..e08fea0 100644 --- a/FightSystem_API/src/de/steamwar/fightsystem/Config.java +++ b/FightSystem_API/src/de/steamwar/fightsystem/Config.java @@ -251,10 +251,6 @@ public class Config { TeamRedPasteZ = TeamBluePasteZ + TeamBluetoReddistanceZ; World world = Bukkit.getWorlds().get(0); - //double yaw = Math.toDegrees(Math.atan2(TeamBluetoReddistanceZ, TeamBluetoReddistanceX) + Math.PI / 2); - //double pitch = Math.toDegrees(Math.atan2(Math.sqrt(TeamBluetoReddistanceZ * TeamBluetoReddistanceZ + TeamBluetoReddistanceX * TeamBluetoReddistanceX), TeamBluetoReddistanceY)); - //double yawInverted = yaw + 180; - //double pitchInverted = ((90 - pitch) * 180) / 180; TeamBlueSpawn = new Location(world, TeamBluePasteX + 0.5 + teamBlueSpawnOffsetX, -- 2.39.2