External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 04:52:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some changes to manual mana pool handling.

Browse source
This commit is contained in:
LevelX2 2014-05-27 08:37:16 +02:00
parent 5481841b9f
commit d9e4e99a0f
13 changed files with 33 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage.Server/src/main/java/mage/server/MageServerImpl.java
View file

@ -570,13 +570,13 @@ public class MageServerImpl implements MageServer {
}
@Override
public void sendPlayerManaType(final UUID gameId, final String sessionId, final ManaType data) throws MageException {
public void sendPlayerManaType(final UUID gameId, final UUID playerId, final String sessionId, final ManaType data) throws MageException {
execute("sendPlayerManaType", sessionId, new Action() {
@Override
public void execute() {
User user = SessionManager.getInstance().getUser(sessionId);
if (user != null) {
user.sendPlayerManaType(gameId, data);
user.sendPlayerManaType(gameId, playerId, data);
} else {
logger.warn("Your session expired: gameId=" + gameId + ", sessionId=" + sessionId);
}

4
Mage.Server/src/main/java/mage/server/User.java
View file

@ -223,9 +223,9 @@ public class User {
GameManager.getInstance().sendPlayerString(gameId, userId, data);
}
public void sendPlayerManaType(final UUID gameId, final ManaType data) {
public void sendPlayerManaType(final UUID gameId, final UUID playerId, final ManaType data) {
lastActivity = new Date();
GameManager.getInstance().sendPlayerManaType(gameId, userId, data);
GameManager.getInstance().sendPlayerManaType(gameId, playerId, userId, data);
}
public void sendPlayerBoolean(final UUID gameId, final Boolean data) {

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

@ -475,11 +475,11 @@ public class GameController implements GameCallback {
});
}
public void sendPlayerManaType(UUID userId, final ManaType data) {
public void sendPlayerManaType(UUID userId, UUID playerId, final ManaType data) {
sendMessage(userId, new Command() {
@Override
public void execute(UUID playerId) {
getGameSession(playerId).sendPlayerManaType(data);
getGameSession(playerId).sendPlayerManaType(data, playerId);
}
});
}

4
Mage.Server/src/main/java/mage/server/game/GameManager.java
View file

@ -85,9 +85,9 @@ public class GameManager {
}
}
public void sendPlayerManaType(UUID gameId, UUID userId, ManaType data) {
public void sendPlayerManaType(UUID gameId, UUID playerId, UUID userId, ManaType data) {
if (gameControllers.containsKey(gameId)) {
gameControllers.get(gameId).sendPlayerManaType(userId, data);
gameControllers.get(gameId).sendPlayerManaType(userId, playerId, data);
}
}

4
Mage.Server/src/main/java/mage/server/game/GameSession.java
View file

@ -221,9 +221,9 @@ public class GameSession extends GameWatcher {
game.getPlayer(playerId).setResponseString(data);
}
public void sendPlayerManaType(ManaType manaType) {
public void sendPlayerManaType(ManaType manaType, UUID playerId) {
cancelTimeout();
game.getPlayer(playerId).setResponseManaType(manaType);
game.getPlayer(playerId).setResponseManaType(playerId, manaType);
}
public void sendPlayerBoolean(Boolean data) {