External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 05:09:16 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/magefree/mage into Network_Upgrade

Browse source 
Conflicts:
	Mage.Client/src/main/java/mage/client/cards/Card.java
	Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
	Mage.Client/src/main/java/mage/client/game/GamePanel.java
	Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
This commit is contained in:
betasteward 2015-08-25 14:07:31 -04:00
commit 1e60605d84
192 changed files with 9432 additions and 2179 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -587,7 +587,7 @@ public class GameController implements GameCallback {
}
break;
default:
game.sendPlayerAction(playerAction, getPlayerId(userId));
game.sendPlayerAction(playerAction, getPlayerId(userId), data);
}
}