Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Fixed remembering self-referential choices (#12167)

Browse source 
* Fixed remembering self-referential choices

* Rename filtered message to auto answer message

* Always use auto answer message
This commit is contained in:
Alexander Novotny 2024-04-22 23:58:26 -04:00 • committed by GitHub
parent 40143c648f
commit 42906f519b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Mage.Client/src/main/java/mage/client/game/HelperPanel.java
View file

@ -64,6 +64,7 @@ public class HelperPanel extends JPanel {
// originalId of feedback causing ability
private UUID originalId;
private String message;
private String autoAnswerMessage; // Filtered version of message which is used for remembering answers to text
private UUID gameId;
private boolean gameNeedFeedback = false;
@ -462,6 +463,10 @@ public class HelperPanel extends JPanel {
this.dialogTextArea.setText(message, this.getWidth());
}
public void setAutoAnswerMessage(String autoAnswerMessage) {
this.autoAnswerMessage = autoAnswerMessage;
}
public void setTextArea(String message) {
this.dialogTextArea.setText(message, this.getWidth());
}
@ -523,19 +528,23 @@ public class HelperPanel extends JPanel {
public void handleAutoAnswerPopupMenuEvent(ActionEvent e) {
switch (e.getActionCommand()) {
case CMD_AUTO_ANSWER_ID_YES:
SessionHandler.sendPlayerAction(REQUEST_AUTO_ANSWER_ID_YES, gameId, originalId.toString() + '#' + message);
SessionHandler.sendPlayerAction(REQUEST_AUTO_ANSWER_ID_YES, gameId,
originalId.toString() + '#' + autoAnswerMessage);
clickButton(btnLeft);
break;
case CMD_AUTO_ANSWER_ID_NO:
SessionHandler.sendPlayerAction(REQUEST_AUTO_ANSWER_ID_NO, gameId, originalId.toString() + '#' + message);
SessionHandler.sendPlayerAction(REQUEST_AUTO_ANSWER_ID_NO, gameId,
originalId.toString() + '#' + autoAnswerMessage);
clickButton(btnRight);
break;
case CMD_AUTO_ANSWER_NAME_YES:
SessionHandler.sendPlayerAction(REQUEST_AUTO_ANSWER_TEXT_YES, gameId, message);
SessionHandler.sendPlayerAction(REQUEST_AUTO_ANSWER_TEXT_YES, gameId,
autoAnswerMessage);
clickButton(btnLeft);
break;
case CMD_AUTO_ANSWER_NAME_NO:
SessionHandler.sendPlayerAction(REQUEST_AUTO_ANSWER_TEXT_NO, gameId, message);
SessionHandler.sendPlayerAction(REQUEST_AUTO_ANSWER_TEXT_NO, gameId,
autoAnswerMessage);
clickButton(btnRight);
break;
case CMD_AUTO_ANSWER_RESET_ALL: