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

Fixed a bug in @open (issue104). Some other refinements.

Browse source
This commit is contained in:
Griatch 2010-09-04 21:52:35 +00:00
parent cbdeae5334
commit 1ed013dc11
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
game/gamesrc/commands/default/comms.py
View file

@ -741,9 +741,6 @@ class CmdPage(MuxCommand):
# get last messages we've got # get last messages we've got
pages_we_got = list(Msg.objects.get_messages_by_receiver(player)) pages_we_got = list(Msg.objects.get_messages_by_receiver(player))
print "we sent:", pages_we_sent
print "we_got:", pages_we_got
if 'list' in self.switches: if 'list' in self.switches:
pages = pages_we_sent + pages_we_got pages = pages_we_sent + pages_we_got
pages.sort(lambda x,y: cmp(x.date_sent, y.date_sent)) pages.sort(lambda x,y: cmp(x.date_sent, y.date_sent))
@ -812,12 +809,13 @@ class CmdPage(MuxCommand):
message = self.rhs message = self.rhs
# if message begins with a :, we assume it is a 'page-pose' # if message begins with a :, we assume it is a 'page-pose'
if message[0] == ":": if message.startswith(":"):
message = message.replace(':', "%s " % caller.key, 1) message = "%s %s" % (caller.key, message.strip(':').strip())
# create the persistent message object # create the persistent message object
msg = create.create_message(player, message, msg = create.create_message(player, message,
receivers=recobjs) receivers=recobjs)
# tell the players they got a message. # tell the players they got a message.
received = [] received = []
for pobj in recobjs: for pobj in recobjs:

4
game/gamesrc/commands/default/objmanip.py
View file

@ -719,8 +719,8 @@ class CmdOpen(ObjManipCommand):
# give error message and return # give error message and return
caller.search(exit_name) caller.search(exit_name)
return return
exit_obj = exit_obj[0] exit_obj = exit_obj
if exit_obj: if exit_obj:
if not exit_obj.db._destination: if not exit_obj.db._destination:
# we are trying to link a non-exit # we are trying to link a non-exit
string = "'%s' already exists and is not an exit!\nIf you want to convert it " string = "'%s' already exists and is not an exit!\nIf you want to convert it "

2
game/gamesrc/commands/default/privileged.py
View file

@ -639,7 +639,7 @@ class CmdPerm(MuxCommand):
caller.msg(string) caller.msg(string)
return return
# locate the object # locate the object/player
obj = caller.search(self.lhs, global_search=True) obj = caller.search(self.lhs, global_search=True)
if not obj: if not obj:
return return

4
src/players/manager.py
View file

@ -33,6 +33,8 @@ def returns_player_list(method):
try: try:
players.append(user.get_profile()) players.append(user.get_profile())
except Exception: except Exception:
print players
print user, user.__class__
logger.log_trace("User has no profile(), maybe database was partially reset?") logger.log_trace("User has no profile(), maybe database was partially reset?")
return players return players
return func return func
@ -56,6 +58,8 @@ class PlayerManager(models.Manager):
Custom manager for the player profile model. We use this Custom manager for the player profile model. We use this
to wrap users in general in evennia, and supply some useful to wrap users in general in evennia, and supply some useful
search/statistics methods. search/statistics methods.
Note how ALL these commands return character objects if possible.
""" """
def num_total_players(self): def num_total_players(self):
""" """