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

Fixed an annoying problem with player creation. It only affected the first player created after the server was started for the first time.

Browse source
This commit is contained in:
Greg Taylor 2009-03-26 14:12:30 +00:00
parent 71a76cd1fb
commit 4426f776fd
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/objects/managers/object.py
View file

@ -14,6 +14,7 @@ from src.config.models import ConfigValue
from src.objects.exceptions import ObjectNotExist from src.objects.exceptions import ObjectNotExist
from src.objects.util import object as util_object from src.objects.util import object as util_object
from src import defines_global from src import defines_global
from src import logger
class ObjectManager(models.Manager): class ObjectManager(models.Manager):
def num_total_players(self): def num_total_players(self):
@ -311,18 +312,22 @@ class ObjectManager(models.Manager):
# pluck the user ID from it. # pluck the user ID from it.
if not str(uid).isdigit(): if not str(uid).isdigit():
uid = uid.id uid = uid.id
logger.log_infomsg('Next usable object ID is %d. (recycled)' % uid)
else:
logger.log_infomsg('Next usable object ID is %d. (new)' % uid)
user = User.objects.create_user(uname, email, password) user = User.objects.create_user(uname, email, password)
# It stinks to have to do this but it's the only trivial way now. # It stinks to have to do this but it's the only trivial way now.
user.save() user.save()
# Update the session to use the newly created User object's ID.
command.session.uid = user.id
# We can't use the user model to change the id because of the way keys # We can't use the user model to change the id because of the way keys
# are handled, so we actually need to fall back to raw SQL. Boo hiss. # are handled, so we actually need to fall back to raw SQL. Boo hiss.
cursor = connection.cursor() cursor = connection.cursor()
cursor.execute("UPDATE auth_user SET id=%d WHERE id=%d" % (uid, user.id)) cursor.execute("UPDATE auth_user SET id=%d WHERE id=%d" % (uid, user.id))
# Update the session to use the newly created User object's ID.
command.session.uid = uid
logger.log_infomsg('User created with id %d.' % command.session.uid)
# Grab the user object again since we've changed it and the old reference # Grab the user object again since we've changed it and the old reference
# is no longer valid. # is no longer valid.
user = User.objects.get(id=uid) user = User.objects.get(id=uid)