From 3a95a7bd27ffb93db7c1c372cb91e761d1edd633 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Thu, 30 Dec 2021 21:53:52 +0100 Subject: [PATCH 1/8] Fix locations Signed-off-by: Lixfel --- .../de/steamwar/fightsystem/record/PacketProcessor.java | 8 ++++---- .../de/steamwar/fightsystem/utils/FightStatistics.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java b/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java index 155605c..13638dd 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java @@ -201,7 +201,7 @@ public class PacketProcessor { z = Config.ArenaRegion.getSizeZ() - z; double locZ = z + Config.ArenaRegion.getMinZ(); float pitch = source.readFloat(); - float yaw = source.readFloat() + (rotateZ ? 360 : 0); + float yaw = source.readFloat() + (rotateZ ? 180 : 0); byte headYaw = (byte)((source.readByte() + (rotateZ ? 128 : 0)) % 256); execSync(() -> REntity.getEntity(entityId).move(locX, locY, locZ, pitch, yaw, headYaw)); @@ -340,9 +340,9 @@ public class PacketProcessor { } private void sound() throws IOException { - int x = source.readInt(); - int y = source.readInt(); - int z = source.readInt(); + int x = source.readInt() - arenaMinX + Config.ArenaRegion.getMinX(); + int y = source.readInt() - arenaMinY + Config.BluePasteRegion.getMinY(); + int z = source.readInt() - arenaMinZ + Config.ArenaRegion.getMinZ(); String soundName = source.readUTF(); String soundCategory = source.readUTF(); diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java b/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java index eba811d..2d300ab 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java @@ -122,11 +122,11 @@ public class FightStatistics { for (FightPlayer fp : Fight.getRedTeam().getPlayers()) savePlayerStats(fp, fightId); - setReplay(fightId, new FileInputStream(FileRecorder.getFile())); - if(ArenaMode.Event.contains(Config.mode)) { FightSystem.getEventFight().setFight(fightId); } + + setReplay(fightId, new FileInputStream(FileRecorder.getFile())); }catch(Exception e){ Bukkit.getLogger().log(Level.SEVERE, "Failed to save statistics", e); } -- 2.39.2 From 7851d560addcf388f99b801adc102f4b9651b798 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Thu, 30 Dec 2021 22:19:13 +0100 Subject: [PATCH 2/8] Fix rotation Signed-off-by: Lixfel --- .../src/de/steamwar/fightsystem/record/PacketProcessor.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java b/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java index 13638dd..973bded 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java @@ -342,7 +342,10 @@ public class PacketProcessor { private void sound() throws IOException { int x = source.readInt() - arenaMinX + Config.ArenaRegion.getMinX(); int y = source.readInt() - arenaMinY + Config.BluePasteRegion.getMinY(); - int z = source.readInt() - arenaMinZ + Config.ArenaRegion.getMinZ(); + int rawZ = source.readInt() - arenaMinZ; + if(rotateZ) + rawZ = Config.ArenaRegion.getSizeZ() - rawZ; + int z = rawZ + Config.ArenaRegion.getMinZ(); String soundName = source.readUTF(); String soundCategory = source.readUTF(); -- 2.39.2 From 55b23cad2c5baed10438cadcd4dad9cc327d414f Mon Sep 17 00:00:00 2001 From: Lixfel Date: Thu, 30 Dec 2021 22:29:56 +0100 Subject: [PATCH 3/8] rebuild Signed-off-by: Lixfel --- .../src/de/steamwar/fightsystem/record/PacketProcessor.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java b/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java index 973bded..5a86b82 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java @@ -343,8 +343,10 @@ public class PacketProcessor { int x = source.readInt() - arenaMinX + Config.ArenaRegion.getMinX(); int y = source.readInt() - arenaMinY + Config.BluePasteRegion.getMinY(); int rawZ = source.readInt() - arenaMinZ; + if(rotateZ) rawZ = Config.ArenaRegion.getSizeZ() - rawZ; + int z = rawZ + Config.ArenaRegion.getMinZ(); String soundName = source.readUTF(); -- 2.39.2 From de2ffa57070942ce73e9a9730981947f4127d218 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Thu, 30 Dec 2021 22:43:07 +0100 Subject: [PATCH 4/8] rebuild Signed-off-by: Lixfel --- .../src/de/steamwar/fightsystem/record/PacketProcessor.java | 1 + 1 file changed, 1 insertion(+) diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java b/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java index 5a86b82..0a9aad1 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java @@ -54,6 +54,7 @@ import java.util.logging.Level; public class PacketProcessor { + static boolean replaying = false; public static boolean isReplaying(){ -- 2.39.2 From 6b0300aa8989cbe9bed01b1373fc5305acca91f2 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Thu, 30 Dec 2021 22:47:56 +0100 Subject: [PATCH 5/8] test build Signed-off-by: Lixfel --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 35a72ae..10a0e47 100644 --- a/pom.xml +++ b/pom.xml @@ -13,6 +13,7 @@ UTF-8 ${project.basedir} + true -- 2.39.2 From 95c96d256a021b3046c7e839c4c7b43c164762f0 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Thu, 30 Dec 2021 22:52:17 +0100 Subject: [PATCH 6/8] test build Signed-off-by: Lixfel --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 10a0e47..35a72ae 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,6 @@ UTF-8 ${project.basedir} - true -- 2.39.2 From 98af118dabb2920bcf36058fa6db740f325d5cdb Mon Sep 17 00:00:00 2001 From: Lixfel Date: Fri, 31 Dec 2021 08:50:38 +0100 Subject: [PATCH 7/8] test build Signed-off-by: Lixfel --- .../src/de/steamwar/fightsystem/record/PacketProcessor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java b/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java index 0a9aad1..5a86b82 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java @@ -54,7 +54,6 @@ import java.util.logging.Level; public class PacketProcessor { - static boolean replaying = false; public static boolean isReplaying(){ -- 2.39.2 From eb824135de59eb4bbeb68922d2b46415c91762dd Mon Sep 17 00:00:00 2001 From: Lixfel Date: Fri, 31 Dec 2021 08:59:54 +0100 Subject: [PATCH 8/8] test build Signed-off-by: Lixfel --- .../src/de/steamwar/fightsystem/record/PacketProcessor.java | 1 + 1 file changed, 1 insertion(+) diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java b/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java index 5a86b82..0a9aad1 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java @@ -54,6 +54,7 @@ import java.util.logging.Level; public class PacketProcessor { + static boolean replaying = false; public static boolean isReplaying(){ -- 2.39.2