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

adding back recent changes - not quite sure how I managed to revert all this

Browse source
This commit is contained in:
BetaSteward 2012-02-02 23:48:25 -05:00
parent 7eb0b19cac
commit d813283c19
36 changed files with 284 additions and 285 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Mage.Server/src/main/java/mage/server/game/GameController.java
View file

@ -28,25 +28,8 @@
package mage.server.game;
import java.io.BufferedOutputStream;
import mage.MageException;
import mage.server.*;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.ObjectOutput;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
import java.io.Serializable;
import java.util.*;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.zip.GZIPOutputStream;
import mage.Constants.Zone;
import mage.MageException;
import mage.abilities.Ability;
import mage.cards.Card;
import mage.cards.Cards;
@ -59,14 +42,26 @@ import mage.game.events.PlayerQueryEvent;
import mage.game.events.TableEvent;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.server.util.SystemUtil;
import mage.server.*;
import mage.server.util.Splitter;
import mage.server.util.SystemUtil;
import mage.server.util.ThreadExecutor;
import mage.sets.Sets;
import mage.view.*;
import mage.view.AbilityPickerView;
import mage.view.CardsView;
import mage.view.ChatMessage.MessageColor;
import mage.view.GameView;
import mage.view.PermanentView;
import org.apache.log4j.Logger;
import java.io.*;
import java.util.*;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.zip.GZIPOutputStream;
/**
*
* @author BetaSteward_at_googlemail.com
@ -596,10 +591,17 @@ public class GameController implements GameCallback {
else {
//System.out.println("asThough: " + playerId + " " + game.getPriorityPlayerId());
Player player = game.getPlayer(playerId);
boolean found = false;
for (UUID controlled : player.getPlayersUnderYourControl()) {
if (gameSessions.containsKey(controlled) && game.getPriorityPlayerId().equals(controlled))
if (gameSessions.containsKey(controlled) && game.getPriorityPlayerId().equals(controlled)) {
command.execute(controlled);
found = true;
}
}
if (!found) {
// something wrong - it may cause game freezes
logger.warn("WARNING! GameController.sendMessage - couldn't find session for action execution.");
}
}
} else {
// ignore - no control over the turn