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

Merge.

Browse source
This commit is contained in:
Griatch 2013-02-01 21:51:13 +01:00
commit 88f327ba40
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/commands/default/building.py
View file

@ -579,7 +579,7 @@ class CmdDestroy(MuxCommand):
else: else:
string += delobj(objname) string += delobj(objname)
else: else:
string += delobj(objname) string += delobj(objname, True)
if string: if string:
caller.msg(string.strip()) caller.msg(string.strip())
@ -665,6 +665,7 @@ class CmdDig(ObjManipCommand):
if not typeclass: if not typeclass:
typeclass = settings.BASE_EXIT_TYPECLASS typeclass = settings.BASE_EXIT_TYPECLASS
print typeclass, to_exit["name"], location, to_exit["aliases"],lockstring, new_room, caller
new_to_exit = create.create_object(typeclass, to_exit["name"], location, new_to_exit = create.create_object(typeclass, to_exit["name"], location,
aliases=to_exit["aliases"], aliases=to_exit["aliases"],
locks=lockstring, destination=new_room, report_to=caller) locks=lockstring, destination=new_room, report_to=caller)
@ -1649,7 +1650,7 @@ class CmdExamine(ObjManipCommand):
else: else:
string = headers["name"] % (obj.name, obj.dbref) string = headers["name"] % (obj.name, obj.dbref)
if hasattr(obj, "aliases") and obj.aliases: if hasattr(obj, "aliases") and obj.aliases:
string += headers["aliases"] % (", ".join(obj.aliases)) string += headers["aliases"] % (", ".join(utils.make_iter(obj.aliases)))
if hasattr(obj, "has_player") and obj.has_player: if hasattr(obj, "has_player") and obj.has_player:
string += headers["player"] % obj.player.name string += headers["player"] % obj.player.name
perms = obj.player.permissions perms = obj.player.permissions

2
src/objects/models.py
View file

@ -230,7 +230,7 @@ class ObjectDB(TypedObject):
for alias in make_iter(aliases): for alias in make_iter(aliases):
new_alias = Alias(db_key=alias, db_obj=self) new_alias = Alias(db_key=alias, db_obj=self)
new_alias.save() new_alias.save()
set_prop_cache(self, "_aliases", aliases) set_prop_cache(self, "_aliases", make_iter(aliases))
#@aliases.deleter #@aliases.deleter
def __aliases_del(self): def __aliases_del(self):
"Deleter. Allows for del self.aliases" "Deleter. Allows for del self.aliases"