|
|
|
@ -1109,13 +1109,13 @@ public enum PowersManager {
@@ -1109,13 +1109,13 @@ public enum PowersManager {
|
|
|
|
|
|
|
|
|
|
//Player didn't miss power, send finish cast. Miss cast already sent.
|
|
|
|
|
|
|
|
|
|
if (playerCharacter.isBoxed) { |
|
|
|
|
if (AbstractCharacter.IsAbstractCharacter(target)) { |
|
|
|
|
if (target.getObjectType().equals(GameObjectType.PlayerCharacter)) { |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
//if (playerCharacter.isBoxed) {
|
|
|
|
|
// if (AbstractCharacter.IsAbstractCharacter(target)) {
|
|
|
|
|
// if (target.getObjectType().equals(GameObjectType.PlayerCharacter)) {
|
|
|
|
|
// return;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
// finally Apply actions
|
|
|
|
|
for (ActionsBase ab : pb.getActions()) { |
|
|
|
@ -1930,16 +1930,16 @@ public enum PowersManager {
@@ -1930,16 +1930,16 @@ public enum PowersManager {
|
|
|
|
|
PowersBase pb, int trains, boolean fromChant) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (ac.getObjectType().equals(GameObjectType.PlayerCharacter)){ |
|
|
|
|
PlayerCharacter pc = (PlayerCharacter) ac; |
|
|
|
|
if (pc.isBoxed && pb.token != -2133617927) { |
|
|
|
|
if(AbstractCharacter.IsAbstractCharacter(target)){ |
|
|
|
|
if (target.getObjectType().equals(GameObjectType.PlayerCharacter)){ |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
//if (ac.getObjectType().equals(GameObjectType.PlayerCharacter)){
|
|
|
|
|
// PlayerCharacter pc = (PlayerCharacter) ac;
|
|
|
|
|
// if (pc.isBoxed && pb.token != -2133617927) {
|
|
|
|
|
// if(AbstractCharacter.IsAbstractCharacter(target)){
|
|
|
|
|
// if (target.getObjectType().equals(GameObjectType.PlayerCharacter)){
|
|
|
|
|
// return;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
//}
|
|
|
|
|
// finally Apply actions
|
|
|
|
|
ArrayList<ActionsBase> actions = pb.getActions(); |
|
|
|
|
for (ActionsBase ab : actions) { |
|
|
|
|