From 93c32a6dc0698e9a2211fc073f0e408efb1045e6 Mon Sep 17 00:00:00 2001
From: Lixfel <agga-games@gmx.de>
Date: Fri, 4 Mar 2022 17:09:24 +0100
Subject: [PATCH] Fix fall damage, async forceload

Signed-off-by: Lixfel <agga-games@gmx.de>
---
 .../steamwar/fightsystem/listener/EntityDamage.java |  4 ++--
 .../fightsystem/record/PacketProcessor.java         | 13 +++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/listener/EntityDamage.java b/FightSystem_Core/src/de/steamwar/fightsystem/listener/EntityDamage.java
index 7644eb6..18959b6 100644
--- a/FightSystem_Core/src/de/steamwar/fightsystem/listener/EntityDamage.java
+++ b/FightSystem_Core/src/de/steamwar/fightsystem/listener/EntityDamage.java
@@ -36,13 +36,13 @@ public class EntityDamage implements Listener {
 
     @EventHandler
     public void handleEntityDamage(EntityDamageEvent event) {
-        if(Config.ArenaRegion.inRegion(event.getEntity().getLocation()))
+        if(Config.ArenaRegion.in2dRegion(event.getEntity().getLocation()))
             event.setCancelled(true);
     }
 
     @EventHandler
     public void handleEntityDamageByEntity(EntityDamageByEntityEvent event) {
-        if(Config.ArenaRegion.inRegion(event.getEntity().getLocation()))
+        if(Config.ArenaRegion.in2dRegion(event.getEntity().getLocation()))
             event.setCancelled(true);
     }
 }
diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java b/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java
index 18e714b..50e096f 100644
--- a/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java
+++ b/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java
@@ -127,7 +127,7 @@ public class PacketProcessor {
         packetDecoder[0xef] = source::readUTF;
         packetDecoder[0xff] = this::tick;
 
-        FightWorld.forceLoad();
+        execSync(FightWorld::forceLoad);
 
         if(source.async()) {
             Bukkit.getScheduler().runTaskAsynchronously(FightSystem.getPlugin(), this::process);
@@ -544,12 +544,11 @@ public class PacketProcessor {
         String msg = source.readUTF();
         List<Object> params = new ArrayList<>();
 
-        int type;
-        do {
-            type = Byte.toUnsignedInt(source.readByte());
+        while(true) {
+            int type = source.readUnsignedByte();
             switch(type) {
                 case 0x00:
-                    break;
+                    return new Message(msg, params.toArray());
                 case 0x01:
                     params.add(source.readBoolean());
                     break;
@@ -577,9 +576,7 @@ public class PacketProcessor {
                 default:
                     throw new IOException("Unknown message param type " + type);
             }
-        } while(type != 0x00);
-
-        return new Message(msg, params.toArray());
+        }
     }
 
     private interface PacketParser{