From f79b326010b975907de11bba301b7e60e9c3eab7 Mon Sep 17 00:00:00 2001 From: Rob Schnautz Date: Fri, 12 Jan 2018 18:06:02 +0000 Subject: [PATCH] Patch for Issue #8, coded by @friarsol --- forge-game/src/main/java/forge/game/Game.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/Game.java b/forge-game/src/main/java/forge/game/Game.java index 635bfedc503..b2b3d51439f 100644 --- a/forge-game/src/main/java/forge/game/Game.java +++ b/forge-game/src/main/java/forge/game/Game.java @@ -638,8 +638,12 @@ public class Game { public int getPosition(Player player, Player startingPlayer) { int startPosition = ingamePlayers.indexOf(startingPlayer); - int position = (ingamePlayers.indexOf(player) + startPosition) % ingamePlayers.size() + 1; - return position; + int myPosition = ingamePlayers.indexOf(player); + if (startPosition > myPosition) { + myPosition += ingamePlayers.size(); + } + + return myPosition - startPosition + 1; } public void onPlayerLost(Player p) {