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

* Fixed bug in @reload that had modules reload in random order (causing custom user modules to not overwrite default ones properly).

Browse source 
* Added more info to multiple match search results, to show which matches are in inventory or not.
/Griatch
This commit is contained in:
Griatch 2009-09-28 20:45:36 +00:00
parent f99614346d
commit 82fe65f31f
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/objects/models.py
View file

@ -187,7 +187,10 @@ class Object(models.Model):
if len(results) > 1: if len(results) > 1:
s = "More than one match for '%s' (please narrow target):" % ostring s = "More than one match for '%s' (please narrow target):" % ostring
for num, result in enumerate(results): for num, result in enumerate(results):
s += "\n %i-%s" % (num+1, result.get_name(show_dbref=False)) invtext = ""
if result.get_location() == self:
invtext = " (carried)"
s += "\n %i-%s%s" % (num+1, result.get_name(show_dbref=False),invtext)
emit_to_obj.emit_to(s) emit_to_obj.emit_to(s)
return False return False
elif len(results) == 0: elif len(results) == 0:

9
src/server.py
View file

@ -114,14 +114,19 @@ class EvenniaService(service.Service):
""" """
cmd_modules = self.get_command_modules() cmd_modules = self.get_command_modules()
s = [] s = []
for mod_str, mod in sys.modules.items(): for mod_str in cmd_modules:
if mod_str in cmd_modules: if not sys.modules.has_key(mod_str):
comsys.cemit_mudinfo("... %s not reloadable." % mod_str)
logger.log_errmsg("Module %s not reloadable." % mod_str)
else:
mod = sys.modules[mod_str]
s.append(mod_str) s.append(mod_str)
try: try:
rebuild.rebuild(mod) rebuild.rebuild(mod)
except: except:
comsys.cemit_mudinfo("... Error reloading %s!" % mod_str) comsys.cemit_mudinfo("... Error reloading %s!" % mod_str)
raise raise
logger.log_infomsg("%s reloaded %i modules: %s" % (source_object, len(s), s)) logger.log_infomsg("%s reloaded %i modules: %s" % (source_object, len(s), s))
def reload_aliases(self, source_object=None): def reload_aliases(self, source_object=None):