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

Removed the normal_mode and ignore_empty keywords of puppet/unpuppet_object and instead handling those checks in the calling methods instead. This makes the call clearer. Also changed to using the on-object scripthandler for validation rather than importing and calling the manager unnecessarily.

Browse source
This commit is contained in:
Griatch 2015-02-28 09:48:40 +01:00
parent 43a597efba
commit 4dc3a3df09
2 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

32
evennia/players/players.py
View file

@ -18,7 +18,6 @@ from evennia.players.manager import PlayerManager
from evennia.players.models import PlayerDB from evennia.players.models import PlayerDB
from evennia.comms.models import ChannelDB from evennia.comms.models import ChannelDB
from evennia.commands import cmdhandler from evennia.commands import cmdhandler
from evennia.scripts.models import ScriptDB
from evennia.utils import logger from evennia.utils import logger
from evennia.utils.utils import (lazy_property, to_str, from evennia.utils.utils import (lazy_property, to_str,
make_iter, to_unicode, make_iter, to_unicode,
@ -161,7 +160,7 @@ class DefaultPlayer(PlayerDB):
# puppeting operations # puppeting operations
def puppet_object(self, sessid, obj, normal_mode=True): def puppet_object(self, sessid, obj):
""" """
Use the given session to control (puppet) the given object (usually Use the given session to control (puppet) the given object (usually
a Character type). a Character type).
@ -169,9 +168,6 @@ class DefaultPlayer(PlayerDB):
Args: Args:
sessid (int): session id of session to connect sessid (int): session id of session to connect
obj (Object): the object to start puppeting obj (Object): the object to start puppeting
normal_mode (bool, optional): trigger hooks and extra
checks - this is turned off when the server reloads, to
quickly re-connect puppets.
Raises: Raises:
RuntimeError with message if puppeting is not possible RuntimeError with message if puppeting is not possible
@ -190,7 +186,7 @@ class DefaultPlayer(PlayerDB):
if not obj.access(self, 'puppet'): if not obj.access(self, 'puppet'):
# no access # no access
raise RuntimeError("You don't have permission to puppet '%s'." % obj.key) raise RuntimeError("You don't have permission to puppet '%s'." % obj.key)
if normal_mode and obj.player: if obj.player:
# object already puppeted # object already puppeted
if obj.player == self: if obj.player == self:
if obj.sessid.count(): if obj.sessid.count():
@ -210,34 +206,34 @@ class DefaultPlayer(PlayerDB):
raise RuntimeError("{R{c%s{R is already puppeted by another Player.") raise RuntimeError("{R{c%s{R is already puppeted by another Player.")
# do the puppeting # do the puppeting
if normal_mode and session.puppet: if session.puppet:
# cleanly unpuppet eventual previous object puppeted by this session # cleanly unpuppet eventual previous object puppeted by this session
self.unpuppet_object(sessid) self.unpuppet_object(sessid)
# if we get to this point the character is ready to puppet or it # if we get to this point the character is ready to puppet or it
# was left with a lingering player/sessid reference from an unclean # was left with a lingering player/sessid reference from an unclean
# server kill or similar # server kill or similar
if normal_mode: obj.at_pre_puppet(self, sessid=sessid)
obj.at_pre_puppet(self, sessid=sessid)
# do the connection # do the connection
obj.sessid.add(sessid) obj.sessid.add(sessid)
obj.player = self obj.player = self
session.puid = obj.id session.puid = obj.id
session.puppet = obj session.puppet = obj
# validate/start persistent scripts on object # validate/start persistent scripts on object
ScriptDB.objects.validate(obj=obj) obj.scripts.validate()
if normal_mode:
obj.at_post_puppet() obj.at_post_puppet()
# re-cache locks to make sure superuser bypass is updated # re-cache locks to make sure superuser bypass is updated
obj.locks.cache_lock_bypass(obj) obj.locks.cache_lock_bypass(obj)
def unpuppet_object(self, sessid, ignore_empty=False): def unpuppet_object(self, sessid):
""" """
Disengage control over an object Disengage control over an object
Args: Args:
sessid(int): the session id to disengage sessid(int): the session id to disengage
ignore_empty(bool): ignores sessions without puppets
Raises: Raises:
RuntimeError with message about error. RuntimeError with message about error.
@ -249,8 +245,8 @@ class DefaultPlayer(PlayerDB):
if not sessions: if not sessions:
raise RuntimeError("No session was found.") raise RuntimeError("No session was found.")
for session in make_iter(sessions): for session in make_iter(sessions):
obj = hasattr(session, "puppet") and session.puppet or None obj = session.puppet or None
if not obj and not ignore_empty: if not obj:
raise RuntimeError("No puppet was found to disconnect from.") raise RuntimeError("No puppet was found to disconnect from.")
elif obj: elif obj:
# do the disconnect, but only if we are the last session to puppet # do the disconnect, but only if we are the last session to puppet
@ -268,8 +264,8 @@ class DefaultPlayer(PlayerDB):
Disconnect all puppets. This is called by server Disconnect all puppets. This is called by server
before a reset/shutdown. before a reset/shutdown.
""" """
for session in self.get_all_sessions(): for session in (sess for sess in self.get_all_sessions() if sess.puppet):
self.unpuppet_object(session.sessid, ignore_empty=True) self.unpuppet_object(session.sessid)
def get_puppet(self, sessid, return_dbobj=False): def get_puppet(self, sessid, return_dbobj=False):
""" """

14
evennia/server/serversession.py
View file

@ -77,9 +77,16 @@ class ServerSession(Session):
if self.puid: if self.puid:
# reconnect puppet (puid is only set if we are coming # reconnect puppet (puid is only set if we are coming
# back from a server reload) # back from a server reload). This does all the steps
# done in the default @ic command but without any
# hooks, echoes or access checks.
obj = _ObjectDB.objects.get(id=self.puid) obj = _ObjectDB.objects.get(id=self.puid)
self.player.puppet_object(self.sessid, obj, normal_mode=False) obj.sessid.add(self.sessid)
obj.player = self.player
self.puid = obj.id
self.puppet = obj
obj.scripts.validate()
obj.locks_cache_lock_bypass(obj)
def at_login(self, player): def at_login(self, player):
""" """
@ -110,7 +117,8 @@ class ServerSession(Session):
if self.logged_in: if self.logged_in:
sessid = self.sessid sessid = self.sessid
player = self.player player = self.player
player.unpuppet_object(sessid, ignore_empty=True) if self.puppet:
player.unpuppet_object(sessid)
uaccount = player uaccount = player
uaccount.last_login = datetime.now() uaccount.last_login = datetime.now()
uaccount.save() uaccount.save()