From 3f78aee7e20464a94f59af5a89adf5e8c1f468d0 Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Fri, 27 Nov 2020 17:17:21 +0100 Subject: [PATCH] Player: fix StackError --- forge-game/src/main/java/forge/game/player/Player.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java index 173be4275e2..7cd9dbbe7fc 100644 --- a/forge-game/src/main/java/forge/game/player/Player.java +++ b/forge-game/src/main/java/forge/game/player/Player.java @@ -2537,14 +2537,14 @@ public class Player extends GameEntity implements Comparable { public void addController(long timestamp, Player pl) { final IGameEntitiesFactory master = (IGameEntitiesFactory)pl.getLobbyPlayer(); - addController(timestamp, master.createMindSlaveController(pl, this), true); + addController(timestamp, pl, master.createMindSlaveController(pl, this), true); } - public void addController(long timestamp, PlayerController pc, boolean event) { + public void addController(long timestamp, Player pl, PlayerController pc, boolean event) { final LobbyPlayer oldLobbyPlayer = getLobbyPlayer(); final PlayerController oldController = getController(); - controlledBy.put(timestamp, Pair.of(pc.getPlayer(), pc)); + controlledBy.put(timestamp, Pair.of(pl, pc)); getView().updateMindSlaveMaster(this); if (event) { @@ -2610,11 +2610,11 @@ public class Player extends GameEntity implements Comparable { */ public void runWithController(Runnable proc, PlayerController tempController) { long ts = game.getNextTimestamp(); - this.addController(ts, tempController, false); + addController(ts, this, tempController, false); try { proc.run(); } finally { - this.removeController(ts, false); + removeController(ts, false); } }