diff options
Diffstat (limited to 'hercules/code/server/tmw')
| -rw-r--r-- | hercules/code/server/tmw/athena.py | 4 | ||||
| -rw-r--r-- | hercules/code/server/tmw/main.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hercules/code/server/tmw/athena.py b/hercules/code/server/tmw/athena.py index 6ad3e9c..6548b2e 100644 --- a/hercules/code/server/tmw/athena.py +++ b/hercules/code/server/tmw/athena.py @@ -7,7 +7,7 @@ import re from code.stringutils import stripNewLine from code.server.dbitem import Item -from code.server.dbskill import Skill, skills +from code.server.dbskill import Skill from code.server.dbuser import User comaSplit = re.compile(",") @@ -89,7 +89,7 @@ def parseVars(line, data): rows = spaceSplit.split(data) if len(rows) < 1: - return skills + return variables for data2 in rows: if data2 == "": diff --git a/hercules/code/server/tmw/main.py b/hercules/code/server/tmw/main.py index f3dd10d..bfbf5ef 100644 --- a/hercules/code/server/tmw/main.py +++ b/hercules/code/server/tmw/main.py @@ -20,7 +20,7 @@ from code.server.tmw.itemdb import convertItemDb from code.server.tmw.mobdb import convertMobDb from code.server.tmw.mobskilldb import convertMobSkillDb from code.server.tmw.npcs import createMainScript, convertNpcs -from code.serverutils import cleanServerData +from code.server.utils import cleanServerData def serverTmwMain(isNew): try: |