diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/actions/DefaultActionsEnvironment.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/actions/DefaultActionsEnvironment.java index 5607e2e52..69aee193e 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/actions/DefaultActionsEnvironment.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/actions/DefaultActionsEnvironment.java @@ -54,7 +54,7 @@ public class DefaultActionsEnvironment implements ActionsEnvironment { _actionProxies.add(actionProxy); } - public void removeStartOfPhaseActionProxies(Phase phase) { + public void signalStartOfPhase(Phase phase) { List list = _untilStartOfPhaseActionProxies.get(phase); if (list != null) { _actionProxies.removeAll(list); @@ -62,7 +62,7 @@ public class DefaultActionsEnvironment implements ActionsEnvironment { } } - public void removeEndOfPhaseActionProxies(Phase phase) { + public void signalEndOfPhase(Phase phase) { List list = _untilEndOfPhaseActionProxies.get(phase); if (list != null) { _actionProxies.removeAll(list); @@ -71,7 +71,7 @@ public class DefaultActionsEnvironment implements ActionsEnvironment { phaseEffectResults.clear(); } - public void removeEndOfTurnActionProxies() { + public void signalEndOfTurn() { _actionProxies.removeAll(_untilEndOfTurnActionProxies); _untilEndOfTurnActionProxies.clear(); turnEffectResults.clear(); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/SkirmishPhaseAction.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/SkirmishPhaseAction.java index 2d3d0981f..6547d8ce6 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/SkirmishPhaseAction.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/SkirmishPhaseAction.java @@ -30,8 +30,8 @@ public class SkirmishPhaseAction extends SystemQueueAction { new UnrespondableEffect() { @Override protected void doPlayEffect(LotroGame game) { - ((ModifiersLogic) game.getModifiersEnvironment()).removeStartOfPhase(Phase.SKIRMISH); - ((DefaultActionsEnvironment) game.getActionsEnvironment()).removeStartOfPhaseActionProxies(Phase.SKIRMISH); + ((ModifiersLogic) game.getModifiersEnvironment()).signalStartOfPhase(Phase.SKIRMISH); + ((DefaultActionsEnvironment) game.getActionsEnvironment()).signalStartOfPhase(Phase.SKIRMISH); } }); appendEffect( @@ -67,8 +67,8 @@ public class SkirmishPhaseAction extends SystemQueueAction { new UnrespondableEffect() { @Override protected void doPlayEffect(LotroGame game) { - ((ModifiersLogic) game.getModifiersEnvironment()).removeEndOfPhase(Phase.SKIRMISH); - ((DefaultActionsEnvironment) game.getActionsEnvironment()).removeEndOfPhaseActionProxies(Phase.SKIRMISH); + ((ModifiersLogic) game.getModifiersEnvironment()).signalEndOfPhase(Phase.SKIRMISH); + ((DefaultActionsEnvironment) game.getActionsEnvironment()).signalEndOfPhase(Phase.SKIRMISH); } }); } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java index ad5b2912a..f1532ac97 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java @@ -157,7 +157,7 @@ public class ModifiersLogic implements ModifiersEnvironment, ModifiersQuerying { } } - public void removeEndOfPhase(Phase phase) { + public void signalEndOfPhase(Phase phase) { List list = _untilEndOfPhaseModifiers.get(phase); if (list != null) { removeModifiers(list); @@ -171,7 +171,7 @@ public class ModifiersLogic implements ModifiersEnvironment, ModifiersQuerying { _woundsPerPhaseMap.clear(); } - public void removeStartOfPhase(Phase phase) { + public void signalStartOfPhase(Phase phase) { List list = _untilStartOfPhaseModifiers.get(phase); if (list != null) { removeModifiers(list); @@ -183,7 +183,7 @@ public class ModifiersLogic implements ModifiersEnvironment, ModifiersQuerying { counterMap.clear(); } - public void removeEndOfTurn() { + public void signalEndOfTurn() { removeModifiers(_untilEndOfTurnModifiers); _untilEndOfTurnModifiers.clear(); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/EndOfTurnGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/EndOfTurnGameProcess.java index 97839ae60..1fd54adb4 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/EndOfTurnGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/EndOfTurnGameProcess.java @@ -31,8 +31,8 @@ public class EndOfTurnGameProcess implements GameProcess { @Override public void playEffect(LotroGame game) { - ((ModifiersLogic) game.getModifiersEnvironment()).removeEndOfTurn(); - ((DefaultActionsEnvironment) game.getActionsEnvironment()).removeEndOfTurnActionProxies(); + ((ModifiersLogic) game.getModifiersEnvironment()).signalEndOfTurn(); + ((DefaultActionsEnvironment) game.getActionsEnvironment()).signalEndOfTurn(); game.getGameState().stopAffectingCardsForCurrentPlayer(); game.getGameState().setCurrentPhase(Phase.BETWEEN_TURNS); } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/EndOfPhaseGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/EndOfPhaseGameProcess.java index 22186c970..feffeed51 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/EndOfPhaseGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/EndOfPhaseGameProcess.java @@ -39,8 +39,8 @@ public class EndOfPhaseGameProcess implements GameProcess { @Override public void playEffect(LotroGame game) { - ((ModifiersLogic) game.getModifiersEnvironment()).removeEndOfPhase(_phase); - ((DefaultActionsEnvironment) game.getActionsEnvironment()).removeEndOfPhaseActionProxies(_phase); + ((ModifiersLogic) game.getModifiersEnvironment()).signalEndOfPhase(_phase); + ((DefaultActionsEnvironment) game.getActionsEnvironment()).signalEndOfPhase(_phase); } }); game.getActionsEnvironment().addActionToStack(action); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/StartOfPhaseGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/StartOfPhaseGameProcess.java index ac2cd16cc..c9ecafaa2 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/StartOfPhaseGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/StartOfPhaseGameProcess.java @@ -47,8 +47,8 @@ public class StartOfPhaseGameProcess implements GameProcess { @Override public void playEffect(LotroGame game) { - ((ModifiersLogic) game.getModifiersEnvironment()).removeStartOfPhase(_phase); - ((DefaultActionsEnvironment) game.getActionsEnvironment()).removeStartOfPhaseActionProxies(_phase); + ((ModifiersLogic) game.getModifiersEnvironment()).signalStartOfPhase(_phase); + ((DefaultActionsEnvironment) game.getActionsEnvironment()).signalStartOfPhase(_phase); } });