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

loop all effects in power actions

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-02-01 15:28:09 -06:00
parent 0c07586927
commit de6158842d
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/handlers/PerformActionMsgHandler.java
+2 -3
View File
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.gameManager.PowersManager;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.PerformActionMsg; import engine.net.client.msg.PerformActionMsg;
@@ -24,8 +23,8 @@ public class PerformActionMsgHandler extends AbstractClientMsgHandler {
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PerformActionMsg msg = (PerformActionMsg) baseMsg; PerformActionMsg msg = (PerformActionMsg) baseMsg;
//PowersManager.usePower(msg, origin, false); // Wtf ? //PowersManager.beginCast(msg, origin, false); // Wtf ?
WpakPowerManager.usePower(msg, origin, false); WpakPowerManager.beginCast(msg, origin, false);
return true; return true;
} }
src/engine/net/client/handlers/SendSummonsMsgHandler.java
+2 -2
View File
@@ -82,8 +82,8 @@ public class SendSummonsMsgHandler extends AbstractClientMsgHandler {
// Client removes 200 mana on summon use.. so don't send message to self // Client removes 200 mana on summon use.. so don't send message to self
target.addSummoner(playerCharacter.getObjectUUID(), System.currentTimeMillis() + MBServerStatics.FOURTYFIVE_SECONDS); target.addSummoner(playerCharacter.getObjectUUID(), System.currentTimeMillis() + MBServerStatics.FOURTYFIVE_SECONDS);
//usePower(pam, origin, false); //beginCast(pam, origin, false);
WpakPowerManager.usePower(pam, origin, false); WpakPowerManager.beginCast(pam, origin, false);
return true; return true;
} }
src/engine/wpak/WpakPowerManager.java
+4 -4
View File
@@ -38,9 +38,9 @@ public class WpakPowerManager {
PowerActionParser.parseWpakFile(); PowerActionParser.parseWpakFile();
} }
public static void usePower(final PerformActionMsg msg, ClientConnection origin, boolean sendCastToSelf) { public static void beginCast(final PerformActionMsg msg, ClientConnection origin, boolean sendCastToSelf) {
if (castPower(msg, origin, sendCastToSelf)) { if (executePower(msg, origin, sendCastToSelf)) {
// Cast failed for some reason, reset timer // Cast failed for some reason, reset timer
RecyclePowerMsg recyclePowerMsg = new RecyclePowerMsg(msg.getPowerUsedID()); RecyclePowerMsg recyclePowerMsg = new RecyclePowerMsg(msg.getPowerUsedID());
@@ -62,7 +62,7 @@ public class WpakPowerManager {
} }
} }
private static boolean castPower(final PerformActionMsg msg, ClientConnection origin, boolean sendCastToSelf) { private static boolean executePower(final PerformActionMsg msg, ClientConnection origin, boolean sendCastToSelf) {
//check to see if the caster is valid //check to see if the caster is valid
PlayerCharacter playerCharacter = SessionManager.getPlayerCharacter(origin); PlayerCharacter playerCharacter = SessionManager.getPlayerCharacter(origin);
@@ -152,7 +152,7 @@ public class WpakPowerManager {
//check to make sure power can be cast on building if target is a building //check to make sure power can be cast on building if target is a building
if (target != null && target.getObjectType() == mbEnums.GameObjectType.Building && !powerCast.target_type.equals(mbEnums.PowerTargetType.BUILDING)) { if (target != null && target.getObjectType() == mbEnums.GameObjectType.Building && !powerCast.target_type.equals(mbEnums.PowerTargetType.BUILDING)) {
PowersManager.sendPowerMsg(playerCharacter, 9, new PerformActionMsg(msg)); sendPowerMsg(playerCharacter, 9, new PerformActionMsg(msg));
return true; return true;
} }