From 3539372437f01b687628218b159276a63272d773 Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Sat, 4 Jan 2025 12:30:17 -0600
Subject: [PATCH] powers manager fixes

---
 src/engine/gameManager/CombatManager.java | 5 ++++-
 src/engine/gameManager/PowersManager.java | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/engine/gameManager/CombatManager.java b/src/engine/gameManager/CombatManager.java
index f1d6fd24..b1386fa1 100644
--- a/src/engine/gameManager/CombatManager.java
+++ b/src/engine/gameManager/CombatManager.java
@@ -1249,7 +1249,10 @@ public enum CombatManager {
         if (pc == null)
             return;
 
-        pc.setSit(toggle);
+        if(pc.isFlying())
+            pc.setSit(false);
+        else
+            pc.setSit(toggle);
 
         UpdateStateMsg rwss = new UpdateStateMsg();
         rwss.setPlayer(pc);
diff --git a/src/engine/gameManager/PowersManager.java b/src/engine/gameManager/PowersManager.java
index 80aa5606..b1d86e70 100644
--- a/src/engine/gameManager/PowersManager.java
+++ b/src/engine/gameManager/PowersManager.java
@@ -164,7 +164,10 @@ public enum PowersManager {
                                 boolean sendCastToSelf) {
 
         PlayerCharacter pc = SessionManager.getPlayerCharacter(origin);
-        CombatManager.toggleSit(false,origin);
+
+        if(!pc.isFlying()) //cant be sitting if flying
+            CombatManager.toggleSit(false,origin);
+
         if(pc.isMoving())
             pc.stopMovement(pc.getMovementLoc());
 
@@ -2691,7 +2694,7 @@ public enum PowersManager {
 
     public static void cancelOnStun(AbstractCharacter ac) {
         if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)){
-            PlayerCharacter.GroundPlayer((PlayerCharacter)ac);
+            //PlayerCharacter.GroundPlayer((PlayerCharacter)ac);
         }
     }