Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-31 13:07:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Run migrations! First version of MULTISESSION_MODE=3. @ic/@ooc not working yet.

Browse source
This commit is contained in:
Griatch 2014-08-04 15:32:48 +02:00
parent 3014909feb
commit 1e41be797b
5 changed files with 206 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/server/sessionhandler.py
View file

@ -15,7 +15,7 @@ There are two similar but separate stores of sessions:
import time
from django.conf import settings
from src.commands.cmdhandler import CMD_LOGINSTART
from src.utils.utils import variable_from_module
from src.utils.utils import variable_from_module, is_iter
try:
import cPickle as pickle
except ImportError:
@ -416,12 +416,18 @@ class ServerSessionHandler(SessionHandler):
"""
Return session based on sessid, or None if not found
"""
if is_iter(sessid):
return [self.sessions.get(sid) for sid in sessid if sid in self.sessions]
return self.sessions.get(sessid)
def session_from_player(self, player, sessid):
"""
Given a player and a session id, return the actual session object
"""
if is_iter(sessid):
sessions = [self.sessions.get(sid) for sid in sessid]
s = [sess for sess in sessions if sess and sess.logged_in and player.uid == sess.uid]
return s
session = self.sessions.get(sessid)
return session and session.logged_in and player.uid == session.uid and session or None