mirror/evennia
3
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-08-18 03:05:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3963 from owllex/fix/3960-custom-puppet-permissions

Browse Source 
Allow customizing permission required to bypass max puppet limit (fixes #3960)
This commit is contained in:
Griatch
2026-07-25 11:03:18 +02:00
committed by GitHub
parent 2e9ba70db3 3ae5a149bd
commit 7475bca761
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
evennia/accounts/accounts.py
View File

@ -57,6 +57,7 @@ _MULTISESSION_MODE = settings.MULTISESSION_MODE
_AUTO_CREATE_CHARACTER_WITH_ACCOUNT = settings.AUTO_CREATE_CHARACTER_WITH_ACCOUNT
_AUTO_PUPPET_ON_LOGIN = settings.AUTO_PUPPET_ON_LOGIN
_MAX_NR_SIMULTANEOUS_PUPPETS = settings.MAX_NR_SIMULTANEOUS_PUPPETS
_PERMISSION_MULTIPLE_PUPPETS = settings.PERMISSION_MULTIPLE_PUPPETS
_MAX_NR_CHARACTERS = settings.MAX_NR_CHARACTERS
_CMDSET_ACCOUNT = settings.CMDSET_ACCOUNT
_MUDINFO_CHANNEL = None
@ -526,7 +527,7 @@ class DefaultAccount(AccountDB, metaclass=TypeclassBase):
already_puppeted = self.get_all_puppets()
if (
not self.is_superuser
and not self.check_permstring("Developer")
and not self.check_permstring(_PERMISSION_MULTIPLE_PUPPETS)
and obj not in already_puppeted
and len(self.get_all_puppets()) >= _MAX_NR_SIMULTANEOUS_PUPPETS
):

20
evennia/accounts/tests.py
View File

@ -427,6 +427,26 @@ class TestDefaultAccountEv(BaseEvenniaTest):
self.account.puppet_object(self.session, self.char1)
self.account.msg.assert_called_with("You are already puppeting this object.")
def test_puppet_limit(self):
"Test that PERMISSION_MULTIPLE_PUPPETS controls who can bypass the puppet limit."
self.account.msg = MagicMock()
self.char2.locks.add("puppet:all()")
with (
patch.object(self.account, "get_all_puppets", return_value=[MagicMock()]),
patch("evennia.accounts.accounts._MULTISESSION_MODE", 2),
patch("evennia.accounts.accounts._MAX_NR_SIMULTANEOUS_PUPPETS", 1),
patch("evennia.accounts.accounts._PERMISSION_MULTIPLE_PUPPETS", "Developer"),
):
self.account.is_superuser = False
self.account.permissions.remove("Developer")
self.account.puppet_object(self.session, self.char2)
self.account.msg.assert_called_with("You cannot control any more puppets (max 1)")
self.account.msg.reset_mock()
self.account.permissions.add("Developer")
self.account.puppet_object(self.session, self.char2)
self.account.msg.assert_not_called()
@patch("evennia.accounts.accounts.time.time", return_value=10000)
def test_idle_time(self, mock_time):
self.session.cmd_last_visible = 10000 - 10

2
evennia/settings_default.py
View File

@ -810,6 +810,8 @@ AUTO_PUPPET_ON_LOGIN = True
# How many *different* characters an account can puppet *at the same time*. A value
# above 1 only makes a difference together with MULTISESSION_MODE > 1.
MAX_NR_SIMULTANEOUS_PUPPETS = 1
# The permission required to bypass MAX_NR_SIMULTANEOUS_PUPPETS.
PERMISSION_MULTIPLE_PUPPETS = "Developer"
# The maximum number of characters allowed by be created by the default ooc
# char-creation command. This can be seen as how big of a 'stable' of characters
# an account can have (not how many you can puppet at the same time). Set to