Fix bug sending THING_CARRYING to clients who don't know about the carrying Thing...

[plomrogue2] / plomrogue / commands.py

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index dc2e6ead099deb9c2a873f93e3309bd327d7d464..07bfae0e1b905f8141fe281d1c475b44fcd400e0 100644 (file)
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -1,5 +1,5 @@
 from plomrogue.misc import quote
-from plomrogue.errors import GameError
+from plomrogue.errors import GameError, ArgError
 
 
 
@@ -151,6 +151,8 @@ def cmd_TURN(game, n):
 cmd_TURN.argtypes = 'int:nonneg'
 
 def cmd_ANNOTATE(game, yx, msg, pw, connection_id):
+    if len(msg) > 500:
+        raise ArgError('annotation text must be <= 500 characters')
     player = game.get_player(connection_id)
     big_yx, little_yx = player.fov_stencil.source_yxyx(yx)
     if not player.fov_test(big_yx, little_yx):
@@ -200,18 +202,6 @@ def cmd_GOD_PORTAL(game, big_yx, little_yx, msg):
     game.changed = True
 cmd_GOD_PORTAL.argtypes = 'yx_tuple yx_tuple:nonneg string'
 
-def cmd_GET_ANNOTATION(game, yx, connection_id):
-    player = game.get_player(connection_id)
-    big_yx, little_yx = player.fov_stencil.source_yxyx(yx)
-    annotation = '(unknown)'
-    if player.fov_test(big_yx, little_yx):
-        annotation = '(none)'
-        if big_yx in game.annotations:
-            if little_yx in game.annotations[big_yx]:
-                annotation = game.annotations[big_yx][little_yx]
-    game.io.send('ANNOTATION %s %s' % (yx, quote(annotation)))
-cmd_GET_ANNOTATION.argtypes = 'yx_tuple:nonneg'
-
 def cmd_MAP_LINE(game, big_yx, y, line):
     map_ = game.get_map(big_yx)
     map_.set_line(y, line)