home
·
contact
·
privacy
projects
/
plomrogue2
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
74c0ec0
)
Disallow usernames with whitespace start or end.
author
Christian Heller
<c.heller@plomlompom.de>
Sat, 12 Dec 2020 23:49:44 +0000
(
00:49
+0100)
committer
Christian Heller
<c.heller@plomlompom.de>
Sat, 12 Dec 2020 23:49:44 +0000
(
00:49
+0100)
plomrogue/commands.py
patch
|
blob
|
history
diff --git
a/plomrogue/commands.py
b/plomrogue/commands.py
index 8b1a1b99d58b54505c1a3c89c5752b11f20481cb..8ea4ff34a738615c53b65f9349f905e483d39169 100644
(file)
--- a/
plomrogue/commands.py
+++ b/
plomrogue/commands.py
@@
-36,11
+36,15
@@
def cmd_SPAWN_POINT(game, big_yx, little_yx):
cmd_SPAWN_POINT.argtypes = 'yx_tuple yx_tuple:nonneg'
def cmd_LOGIN(game, nick, connection_id):
cmd_SPAWN_POINT.argtypes = 'yx_tuple yx_tuple:nonneg'
def cmd_LOGIN(game, nick, connection_id):
+ nick = nick.strip()
+ if len(nick) == 0:
+ raise GameError('empty name')
for t in [t for t in game.things if t.type_ == 'Player' and t.name == nick]:
raise GameError('name already in use')
if game.get_player(connection_id):
raise GameError('cannot log in twice')
t = game.add_thing('Player', game.spawn_point)
for t in [t for t in game.things if t.type_ == 'Player' and t.name == nick]:
raise GameError('name already in use')
if game.get_player(connection_id):
raise GameError('cannot log in twice')
t = game.add_thing('Player', game.spawn_point)
+ t.name = nick
t.thing_char = game.get_next_player_char()
game.sessions[connection_id] = {
'thing_id': t.id_,
t.thing_char = game.get_next_player_char()
game.sessions[connection_id] = {
'thing_id': t.id_,
@@
-48,7
+52,6
@@
def cmd_LOGIN(game, nick, connection_id):
}
game.io.send('PLAYER_ID %s' % t.id_, connection_id)
game.io.send('LOGIN_OK', connection_id)
}
game.io.send('PLAYER_ID %s' % t.id_, connection_id)
game.io.send('LOGIN_OK', connection_id)
- t.name = nick
game.io.send('CHAT ' + quote(t.name + ' entered the map.'))
for s in [s for s in game.things
if s.type_ == 'SpawnPoint' and s.name == t.name]:
game.io.send('CHAT ' + quote(t.name + ' entered the map.'))
for s in [s for s in game.things
if s.type_ == 'SpawnPoint' and s.name == t.name]:
@@
-113,6
+116,9
@@
def cmd_SET_MAP_CONTROL_PASSWORD(game, tile_class, password, connection_id):
cmd_SET_MAP_CONTROL_PASSWORD.argtypes = 'char string'
def cmd_NICK(game, nick, connection_id):
cmd_SET_MAP_CONTROL_PASSWORD.argtypes = 'char string'
def cmd_NICK(game, nick, connection_id):
+ nick = nick.strip()
+ if len(nick) == 0:
+ raise GameError('empty name')
for t in [t for t in game.things if t.type_ == 'Player' and t.name == nick]:
raise GameError('name already in use')
t = game.get_player(connection_id)
for t in [t for t in game.things if t.type_ == 'Player' and t.name == nick]:
raise GameError('name already in use')
t = game.get_player(connection_id)