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

fix null-check in raging river and a watcher

Browse source
This commit is contained in:
igoudt 2018-01-13 23:26:35 +01:00
parent ed3742b1e4
commit 7f319c2751
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldYourLastTurnWatcher.java
View file

@ -5,16 +5,17 @@
*/
package mage.watchers.common;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.UUID;
import mage.constants.WatcherScope;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.watchers.Watcher;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.UUID;
/**
*
* @author LevelX2 (spjspj)
@ -75,7 +76,7 @@ public class PermanentsEnteredBattlefieldYourLastTurnWatcher extends Watcher {
}
public List<Permanent> getPermanentsEnteringOnPlayersLastTurn(Game game, UUID playerId) {
if (game.getActivePlayerId() == playerId) {
if (game.getActivePlayerId().equals(playerId)) {
return enteringBattlefield.get(playerId);
}
return enteringBattlefieldLastTurn.get(playerId);