X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=server_%2Fgame.py;h=148c5c7c8fd9db3909df52eea4213ce6284476df;hb=1d3411457a0ac41e86b44c635b6896ba7f3ab0f1;hp=da2f61184b43bce0052d42139c438fd6fee7e54c;hpb=17984bc886e3a233b828a53354467bbda2c43692;p=plomrogue2-experiments

diff --git a/server_/game.py b/server_/game.py
index da2f611..148c5c7 100644
--- a/server_/game.py
+++ b/server_/game.py
@@ -38,16 +38,20 @@ class World(game_common.World):
         the player's task is finished, the loop breaks.
         """
         while True:
-            for thing in self.things[self.player_id+1:]:
+            player = self.get_player()
+            player_i = self.things.index(player)
+            for thing in self.things[player_i+1:]:
                 thing.proceed()
             self.turn += 1
-            for thing in self.things[:self.player_id]:
+            for thing in self.things[:player_i]:
                 thing.proceed()
-            player = self.get_thing(self.player_id)
             player.proceed(is_AI=False)
             if player.task is None:
                 break
 
+    def get_player(self):
+        return self.get_thing(self.player_id)
+
 
 class Task: