X-Git-Url: https://plomlompom.com/repos/new_day?a=blobdiff_plain;f=server_%2Fgame.py;h=af6c97030c1096395f742e71daae002ae5987186;hb=59cd3d03e10e86125daed00e8d1b5576575ead1c;hp=878917fbda7711a741c53a981737be741942ffda;hpb=71a615834e518a028e246d072d8bd5931e78405b;p=plomrogue2-experiments

diff --git a/server_/game.py b/server_/game.py
index 878917f..af6c970 100644
--- a/server_/game.py
+++ b/server_/game.py
@@ -79,6 +79,9 @@ class Task:
             map_tile = self.thing.world.terrain_map[pos_i]
             if map_tile != '.':
                 raise GameError('would move into illegal terrain')
+            for t in self.thing.world.things:
+                if t.position == test_pos:
+                    raise GameError('would move into other thing')
 
 
 class Thing(game_common.Thing):
@@ -150,16 +153,16 @@ class Commander():
         self.world.get_player().set_task('wait')
         self.proceed()
 
-    def cmd_GET_TURN(self, connection_id):
-        """Send world.turn to caller."""
-        self.send_to(connection_id, str(self.world.turn))
+    def cmd_GET_GAMESTATE(self, connection_id):
+        """Send game state jto caller."""
+        self.send_gamestate(connection_id)
 
     def cmd_ECHO(self, msg, connection_id):
         """Send msg to caller."""
-        self.send_to(connection_id, msg)
+        self.send(msg, connection_id)
     cmd_ECHO.argtypes = 'string'
 
     def cmd_ALL(self, msg, connection_id):
         """Send msg to all clients."""
-        self.send_all(msg)
+        self.send(msg)
     cmd_ALL.argtypes = 'string'