Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-26 17:56:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed creation function that caused entities to be wrong-named in certain circumstances. Server now starts and shutsdown without tracebacks.

Browse source
This commit is contained in:
Griatch 2015-01-01 21:13:36 +01:00
parent 3d557f6bf9
commit 0b01df1fcc
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/comms/comms.py
View file

@ -31,7 +31,8 @@ class Channel(ChannelDB):
# with the utils.create.create_channel function.
cdict = self._createdict
if not cdict["key"]:
self.db_key = "#i" % self.dbid
if not self.db_key:
self.db_key = "#i" % self.dbid
elif cdict["key"] and self.key != cdict["key"]:
self.key = cdict["key"]
if cdict["keep_log"]:

5
src/objects/objects.py
View file

@ -859,8 +859,9 @@ class DefaultObject(ObjectDB):
cdict = self._createdict
updates = []
if not cdict["key"]:
self.db_key = "#%i" % self.dbid
updates.append("db_key")
if not self.db_key:
self.db_key = "#%i" % self.dbid
updates.append("db_key")
elif self.key != cdict["key"]:
updates.append("db_key")
self.db_key = cdict["key"]

7
src/scripts/scripts.py
View file

@ -444,9 +444,10 @@ class Script(ScriptBase):
cdict = self._createdict
updates = []
if not cdict["key"]:
self.db_key = "#%i" % self.dbid
updates.append("db_key")
elif self.key != cdict["db_key"]:
if not self.db_key:
self.db_key = "#%i" % self.dbid
updates.append("db_key")
elif self.db_key != cdict["db_key"]:
self.db_key = cdict["key"]
updates.append("db_key")
if cdict["interval"] and self.interval != cdict["interval"]: