diff --git a/evennia/players/bots.py b/evennia/players/bots.py index 7df6e315ac..845d570623 100644 --- a/evennia/players/bots.py +++ b/evennia/players/bots.py @@ -120,13 +120,13 @@ class Bot(DefaultPlayer): """ Evennia -> outgoing protocol """ - pass + super(Bot, self).msg(text=text, from_obj=from_obj, sessid=sessid, **kwargs) def execute_cmd(self, raw_string, sessid=None): """ Incoming protocol -> Evennia """ - pass + super(Bot, self).msg(raw_string, sessid=sessid) def at_server_shutdown(self): "We need to handle this case manually since the shutdown may be a reset" @@ -198,7 +198,7 @@ class IRCBot(Bot): if "from_channel" in kwargs and text and self.ndb.ev_channel.dbid == kwargs["from_channel"]: if "from_obj" not in kwargs or kwargs["from_obj"] != [self.id]: text = "bot_data_out %s" % text - self.msg(text=text) + super(IRCBot, self).msg(text=text) def execute_cmd(self, text=None, sessid=None): """ @@ -211,7 +211,6 @@ class IRCBot(Bot): if self.ndb.ev_channel: self.ndb.ev_channel.msg(text, senders=self.id) - # RSS class RSSBot(Bot): @@ -260,6 +259,8 @@ class RSSBot(Bot): if self.ndb.ev_channel: self.ndb.ev_channel.msg(text, senders=self.id) +# IMC2 + class IMC2Bot(Bot): """ IMC2 Bot diff --git a/evennia/players/players.py b/evennia/players/players.py index 30e525c686..7ef1f90a93 100644 --- a/evennia/players/players.py +++ b/evennia/players/players.py @@ -350,7 +350,6 @@ class DefaultPlayer(PlayerDB): pass # session relay - if sessid: # this could still be an iterable if sessid is an iterable sessions = self.get_session(sessid) diff --git a/evennia/scripts/scripthandler.py b/evennia/scripts/scripthandler.py index 3eda89d961..6ec5cf635d 100644 --- a/evennia/scripts/scripthandler.py +++ b/evennia/scripts/scripthandler.py @@ -58,7 +58,7 @@ class ScriptHandler(object): definition) autostart - start the script upon adding it """ - if self.obj.__class__.__name__ == "PlayerDB": + if self.obj.__dbclass__.__name__ == "PlayerDB": # we add to a Player, not an Object script = create.create_script(scriptclass, key=key, player=self.obj, autostart=autostart) diff --git a/evennia/server/portal/irc.py b/evennia/server/portal/irc.py index fd6c34e79e..789c50a999 100644 --- a/evennia/server/portal/irc.py +++ b/evennia/server/portal/irc.py @@ -10,6 +10,11 @@ from twisted.internet import protocol from evennia.server.session import Session from evennia.utils import logger +# IRC colors + + + + # IRC bot