external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
Maxmtg
2013-05-27 12:56:33 +00:00
parent 4a9930defb
commit b88acfe51f
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/card/ability/effects/ControlPlayerEffect.java
View File

@@ -39,7 +39,7 @@ public class ControlPlayerEffect extends SpellAbilityEffect {
pTarget.obeyNewMaster(activator.getLobbyPlayer().createControllerFor(pTarget));
// on following cleanup release control
game.getCleanup().addUntil(pTarget, new Command() {
game.getCleanup().addAt(new Command() {
@Override
public void run() {
pTarget.releaseControl();

6
src/main/java/forge/gui/match/controllers/CDock.java
View File

@@ -83,8 +83,10 @@ public enum CDock implements ICDoc {
final Player p = findAffectedPlayer();
if( p == null ) return;
if( p.isMindSlaved() )
GuiDialog.message("You cannot make concede a player you temporary control");
if( p.isMindSlaved() ) {
GuiDialog.message("You cannot make concede a player you temporarily control");
return;
}
game.getInputQueue().invokeGameAction(new Runnable() {
@Override