BadBird/BattleBane
1
0
Fork 0
forked from MagicBane/Server
Code Issues 1 Pull Requests Projects Releases Wiki Activity

PvE flagged system

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-03-20 19:55:44 -05:00
parent ef9c431d5e
commit 3bca48abe4
4 changed files with 73 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/CombatManager.java
+4
View File
@@ -101,6 +101,10 @@ public enum CombatManager {
public static void AttackTarget(PlayerCharacter playerCharacter, AbstractWorldObject target) {
if(playerCharacter != null && playerCharacter.isBoxed)
if(target.getObjectType().equals(GameObjectType.PlayerCharacter))
return;
boolean swingOffhand = false;
//check my weapon can I do an offhand attack
src/engine/gameManager/PowersManager.java
+4 -5
View File
@@ -173,8 +173,7 @@ public enum PowersManager {
if(!pc.isFlying() && powersBaseByToken.get(msg.getPowerUsedID()) != null && powersBaseByToken.get(msg.getPowerUsedID()).isSpell) //cant be sitting if flying
CombatManager.toggleSit(false,origin);
if(pc.isMoving())
pc.stopMovement(pc.getMovementLoc());
if(msg.getPowerUsedID() != 421084024 && origin.getPlayerCharacter().getPromotionClassID() != 2513) {
if (!origin.getPlayerCharacter().getPowers().containsKey(msg.getPowerUsedID())) {
Logger.error(origin.getPlayerCharacter().getFirstName() + " attempted to cast a power they do not have");
@@ -1094,7 +1093,7 @@ public enum PowersManager {
continue;
// If something blocks the action, then stop
if (ab.blocked(target, pb, trains)) {
if (ab.blocked(target, pb, trains,playerCharacter)) {
PowersManager.sendEffectMsg(playerCharacter, 5, ab, pb);
continue;
@@ -1281,7 +1280,7 @@ public enum PowersManager {
continue;
// If something blocks the action, then stop
if (ab.blocked(target, pb, trains))
if (ab.blocked(target, pb, trains,caster))
continue;
// TODO handle overwrite stack order here
String stackType = ab.getStackType();
@@ -1900,7 +1899,7 @@ public enum PowersManager {
if (trains < ab.getMinTrains() || trains > ab.getMaxTrains())
continue;
// If something blocks the action, then stop
if (ab.blocked(target, pb, trains))
if (ab.blocked(target, pb, trains,ac))
// sendPowerMsg(pc, 5, msg);
continue;
// TODO handle overwrite stack order here