From 748b3cb769b2dbd30c2e4cac45a347d90302db3d Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Fri, 3 Apr 2020 10:59:46 -0400 Subject: [PATCH] Revert 'YesOrNo choice can now be given to any player' Is not handling player correctly for some reason, causes game to hang indefinitely (it becomes neither player's action). --- .../cards/build/field/effect/appender/ChooseYesOrNo.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ChooseYesOrNo.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ChooseYesOrNo.java index c5b3d8878..3235c9460 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ChooseYesOrNo.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ChooseYesOrNo.java @@ -16,7 +16,7 @@ import org.json.simple.JSONObject; public class ChooseYesOrNo implements EffectAppenderProducer { @Override public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "text", "player", "memorize", "yes", "no"); + FieldUtils.validateAllowedFields(effectObject, "text", "memorize", "yes", "no"); final String text = FieldUtils.getString(effectObject.get("text"), "text"); if (text == null) @@ -24,12 +24,11 @@ public class ChooseYesOrNo implements EffectAppenderProducer { final String memorize = FieldUtils.getString(effectObject.get("memorize"), "memorize"); final String yesAnswer = FieldUtils.getString(effectObject.get("yes"), "yes"); final String noAnswer = FieldUtils.getString(effectObject.get("no"), "no"); - String player = FieldUtils.getString(effectObject.get("player"), "player", "you"); return new DelayedAppender() { @Override protected Effect createEffect(boolean cost, CostToEffectAction action, ActionContext actionContext) { - return new PlayoutDecisionEffect(player, + return new PlayoutDecisionEffect(actionContext.getPerformingPlayer(), new YesNoDecision(text) { @Override protected void yes() {