Ensure enters the battlefield triggered abilities are visible on stack

This commit is contained in:
drdev
2013-12-02 07:06:50 +00:00
parent 500632515c
commit 93b6ac15dd

View File

@@ -244,6 +244,7 @@ public enum VStack implements IVDoc<CStack> {
} }
if (!cardView) { if (!cardView) {
parentCell.getBody().validate();
parentCell.getBody().repaint(); parentCell.getBody().repaint();
} }
} }
@@ -307,7 +308,7 @@ public enum VStack implements IVDoc<CStack> {
jmiAccept.addActionListener(new ActionListener() { jmiAccept.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent arg0) { public void actionPerformed(ActionEvent arg0) {
if ( localPlayer == null ) return; if (localPlayer == null) { return; }
localPlayer.setShouldAlwaysAcceptTrigger(triggerID); localPlayer.setShouldAlwaysAcceptTrigger(triggerID);
} }
}); });
@@ -315,7 +316,7 @@ public enum VStack implements IVDoc<CStack> {
jmiDecline.addActionListener(new ActionListener() { jmiDecline.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent arg0) { public void actionPerformed(ActionEvent arg0) {
if ( localPlayer == null ) return; if (localPlayer == null) { return; }
localPlayer.setShouldAlwaysDeclineTrigger(triggerID); localPlayer.setShouldAlwaysDeclineTrigger(triggerID);
} }
}); });
@@ -323,7 +324,7 @@ public enum VStack implements IVDoc<CStack> {
jmiAsk.addActionListener(new ActionListener() { jmiAsk.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent arg0) { public void actionPerformed(ActionEvent arg0) {
if ( localPlayer == null ) return; if (localPlayer == null) { return; }
localPlayer.setShouldAlwaysAskTrigger(triggerID); localPlayer.setShouldAlwaysAskTrigger(triggerID);
} }
}); });
@@ -333,21 +334,22 @@ public enum VStack implements IVDoc<CStack> {
add(jmiAsk); add(jmiAsk);
} }
public void setStackInstance(final SpellAbilityStackInstance SI) public void setStackInstance(final SpellAbilityStackInstance SI) {
{
localPlayer = SI.getSpellAbility().getActivatingPlayer().getController(); localPlayer = SI.getSpellAbility().getActivatingPlayer().getController();
triggerID = SI.getSpellAbility().getSourceTrigger(); triggerID = SI.getSpellAbility().getSourceTrigger();
if(localPlayer.shouldAlwaysAcceptTrigger(triggerID)) { if (localPlayer.shouldAlwaysAcceptTrigger(triggerID)) {
jmiAccept.setSelected(true); jmiAccept.setSelected(true);
jmiDecline.setSelected(false); jmiDecline.setSelected(false);
jmiAsk.setSelected(false); jmiAsk.setSelected(false);
} else if(localPlayer.shouldAlwaysDeclineTrigger(triggerID)) { }
else if (localPlayer.shouldAlwaysDeclineTrigger(triggerID)) {
jmiDecline.setSelected(true); jmiDecline.setSelected(true);
jmiAccept.setSelected(false); jmiAccept.setSelected(false);
jmiAsk.setSelected(false); jmiAsk.setSelected(false);
} else { }
else {
jmiAsk.setSelected(true); jmiAsk.setSelected(true);
jmiAccept.setSelected(false); jmiAccept.setSelected(false);
jmiDecline.setSelected(false); jmiDecline.setSelected(false);