MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

powers manager fixes

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-01-04 12:30:17 -06:00
parent 7c498625bd
commit 3539372437
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/CombatManager.java
+4 -1
View File
@@ -1249,7 +1249,10 @@ public enum CombatManager {
if (pc == null) if (pc == null)
return; return;
pc.setSit(toggle); if(pc.isFlying())
pc.setSit(false);
else
pc.setSit(toggle);
UpdateStateMsg rwss = new UpdateStateMsg(); UpdateStateMsg rwss = new UpdateStateMsg();
rwss.setPlayer(pc); rwss.setPlayer(pc);
src/engine/gameManager/PowersManager.java
+5 -2
View File
@@ -164,7 +164,10 @@ public enum PowersManager {
boolean sendCastToSelf) { boolean sendCastToSelf) {
PlayerCharacter pc = SessionManager.getPlayerCharacter(origin); PlayerCharacter pc = SessionManager.getPlayerCharacter(origin);
CombatManager.toggleSit(false,origin);
if(!pc.isFlying()) //cant be sitting if flying
CombatManager.toggleSit(false,origin);
if(pc.isMoving()) if(pc.isMoving())
pc.stopMovement(pc.getMovementLoc()); pc.stopMovement(pc.getMovementLoc());
@@ -2691,7 +2694,7 @@ public enum PowersManager {
public static void cancelOnStun(AbstractCharacter ac) { public static void cancelOnStun(AbstractCharacter ac) {
if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)){ if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)){
PlayerCharacter.GroundPlayer((PlayerCharacter)ac); //PlayerCharacter.GroundPlayer((PlayerCharacter)ac);
} }
} }