forked from MagicBane/Server
loop all effects in power actions
This commit is contained in:
@@ -8,7 +8,6 @@
|
||||
|
||||
package engine.net.client.handlers;
|
||||
|
||||
import engine.gameManager.PowersManager;
|
||||
import engine.net.client.ClientConnection;
|
||||
import engine.net.client.msg.ClientNetMsg;
|
||||
import engine.net.client.msg.PerformActionMsg;
|
||||
@@ -24,8 +23,8 @@ public class PerformActionMsgHandler extends AbstractClientMsgHandler {
|
||||
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
|
||||
|
||||
PerformActionMsg msg = (PerformActionMsg) baseMsg;
|
||||
//PowersManager.usePower(msg, origin, false); // Wtf ?
|
||||
WpakPowerManager.usePower(msg, origin, false);
|
||||
//PowersManager.beginCast(msg, origin, false); // Wtf ?
|
||||
WpakPowerManager.beginCast(msg, origin, false);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -82,8 +82,8 @@ public class SendSummonsMsgHandler extends AbstractClientMsgHandler {
|
||||
|
||||
// Client removes 200 mana on summon use.. so don't send message to self
|
||||
target.addSummoner(playerCharacter.getObjectUUID(), System.currentTimeMillis() + MBServerStatics.FOURTYFIVE_SECONDS);
|
||||
//usePower(pam, origin, false);
|
||||
WpakPowerManager.usePower(pam, origin, false);
|
||||
//beginCast(pam, origin, false);
|
||||
WpakPowerManager.beginCast(pam, origin, false);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -38,9 +38,9 @@ public class WpakPowerManager {
|
||||
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
|
||||
|
||||
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
|
||||
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
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user