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

Merge remote-tracking branch 'origin/master' into maintenance-times

Browse source
This commit is contained in:
RealKinetix 2021-04-06 18:51:11 -07:00
commit e6ddc4ffb1
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
bin/unix/evennia.service
View file

@ -26,6 +26,11 @@ User=your-user
#
ExecStart=/your/path/to/pyenv/bin/python /your/path/to/evennia/bin/unix/evennia ipstart --gamedir /your/path/to/mygame
#
# Service needs to know the path to twistd binary
# Replace /your/path/to/venv/bin with whatever is appropriate
Environment="PATH=/your/path/to/pyenv/bin:$PATH"
# restart on all failures, wait 3 seconds before doing so.
Restart=on-failure
RestartSec=3

2
evennia/accounts/accounts.py
View file

@ -1500,7 +1500,7 @@ class DefaultAccount(AccountDB, metaclass=TypeclassBase):
)
)
result.append("\n\n |whelp|n - more commands")
result.append("\n |wooc <Text>|n - talk on public channel")
result.append("\n |wpublic <Text>|n - talk on public channel")
charmax = _MAX_NR_CHARACTERS

6
evennia/objects/objects.py
View file

@ -628,7 +628,7 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase):
logger.log_trace()
kwargs["options"] = options
try:
if not self.at_msg_receive(text=text, **kwargs):
if not self.at_msg_receive(text=text, from_obj=from_obj, **kwargs):
# if at_msg_receive returns false, we abort message to this object
return
except Exception:
@ -1443,7 +1443,7 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase):
}
)
location.msg_contents(string, exclude=(self,), mapping=mapping)
location.msg_contents(string, exclude=(self,), from_obj=self, mapping=mapping)
def announce_move_to(self, source_location, msg=None, mapping=None, **kwargs):
"""
@ -1505,7 +1505,7 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase):
}
)
destination.msg_contents(string, exclude=(self,), mapping=mapping)
destination.msg_contents(string, exclude=(self,), from_obj=self, mapping=mapping)
def at_after_move(self, source_location, **kwargs):
"""