Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed the redundant handling of location within @IC and @OOC. These should be handled by the hooks.

Browse source
This commit is contained in:
Kelketek 2013-05-18 20:05:42 -05:00
parent cab0182077
commit 93d0db8489
1 changed files with 0 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/commands/default/player.py
View file

@ -248,13 +248,6 @@ class CmdIC(MuxPlayerCommand):
return return
if player.puppet_object(sessid, new_character): if player.puppet_object(sessid, new_character):
player.db._last_puppet = new_character player.db._last_puppet = new_character
if not new_character.location:
# this might be due to being hidden away at logout; check
loc = new_character.db.prelogout_location
if not loc: # still no location; use home
loc = new_character.home
new_character.location = loc
new_character.location.at_object_receive(new_character, new_character.location)
else: else:
self.msg("{rYou cannot become {C%s{n." % new_character.name) self.msg("{rYou cannot become {C%s{n." % new_character.name)
@ -291,8 +284,6 @@ class CmdOOC(MuxPlayerCommand):
# save location as if we were disconnecting from the game entirely. # save location as if we were disconnecting from the game entirely.
if old_char.location: if old_char.location:
old_char.location.msg_contents("%s has left the game." % old_char.key, exclude=[old_char]) old_char.location.msg_contents("%s has left the game." % old_char.key, exclude=[old_char])
old_char.db.prelogout_location = old_char.location
old_char.location = None
# disconnect # disconnect
if player.unpuppet_object(sessid): if player.unpuppet_object(sessid):