mirror of
https://github.com/evennia/evennia.git
synced 2026-04-06 16:44:08 +02:00
Merge pull request #470 from delizin/master
Resolution to issue #469: Messages "Player has enter the game" and "Player has left the game" repeated twice.
This commit is contained in:
commit
6624f6c150
3 changed files with 1 additions and 6 deletions
|
|
@ -1,8 +1,7 @@
|
|||
|
||||
# Evennia dependencies. If using pip, this file can be used to install
|
||||
# dependencies directly, using 'pip install -r requirements.txt'.
|
||||
|
||||
django >= 1.5
|
||||
twisted >= 11.0
|
||||
pil
|
||||
south >= 0.8
|
||||
south >= 0.8.4
|
||||
|
|
|
|||
|
|
@ -289,9 +289,6 @@ class CmdOOC(MuxPlayerCommand):
|
|||
return
|
||||
|
||||
player.db._last_puppet = old_char
|
||||
# save location as if we were disconnecting from the game entirely.
|
||||
if old_char.location:
|
||||
old_char.location.msg_contents("%s has left the game." % old_char.key, exclude=[old_char])
|
||||
|
||||
# disconnect
|
||||
if player.unpuppet_object(sessid):
|
||||
|
|
|
|||
|
|
@ -902,7 +902,6 @@ class Character(Object):
|
|||
if self.location:
|
||||
# save location again to be sure
|
||||
self.db.prelogout_location = self.location
|
||||
self.location.msg_contents("%s has entered the game." % self.name, exclude=[self])
|
||||
self.location.at_object_receive(self, self.location)
|
||||
else:
|
||||
player.msg("{r%s has no location and no home is set.{n" % self, sessid=sessid)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue