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

Fixes a few more command errors in commands without args. Create from the login screen now works without errors again.

Browse source
This commit is contained in:
Greg Taylor 2009-01-15 03:48:42 +00:00
parent 59e5f60e34
commit 51a648ddab
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/commands/comsys.py
View file

@ -20,11 +20,12 @@ def cmd_addcom(command):
""" """
session = command.session session = command.session
pobject = session.get_pobject() pobject = session.get_pobject()
eq_args = command.command_argument.split('=', 1)
if not command.command_argument: if not command.command_argument:
session.msg("You need to specify a channel alias and name.") session.msg("You need to specify a channel alias and name.")
return return
eq_args = command.command_argument.split('=', 1)
chan_alias = eq_args[0] chan_alias = eq_args[0]
chan_name = eq_args[1] chan_name = eq_args[1]
@ -62,7 +63,7 @@ def cmd_delcom(command):
session = command.session session = command.session
pobject = session.get_pobject() pobject = session.get_pobject()
if len(command.command_argument) == 0: if not command.command_argument:
session.msg("You must specify a channel alias.") session.msg("You must specify a channel alias.")
return return

5
src/objects/models.py
View file

@ -748,8 +748,9 @@ class Object(models.Model):
self.get_location().emit_to_contents(arrival_message, exclude=self) self.get_location().emit_to_contents(arrival_message, exclude=self)
if self.location.is_player(): if self.location.is_player():
self.location.emit_to("%s is now in your inventory." % (self.get_name())) self.location.emit_to("%s is now in your inventory." % (self.get_name()))
if force_look and self.is_player(): session = self.get_session()
if force_look and self.is_player() and session:
self.get_session().execute_cmd('look') self.get_session().execute_cmd('look')
def dbref_match(self, oname): def dbref_match(self, oname):