Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-16 21:06:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3204 from InspectorCaracal/patch-7

Browse source 
Fix bug in the container contrib "look"
This commit is contained in:
Griatch 2023-06-11 15:26:27 +02:00 • committed by GitHub
commit 7b309b6f24
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
evennia/contrib/game_systems/containers/containers.py
View file

@ -131,15 +131,16 @@ class CmdContainerLook(CmdLook):
if not target:
self.msg("You have no location to look at!")
return
elif self.rhs:
# we are looking in something, find that first
container = caller.search(self.rhs)
if not container:
return
else:
if self.rhs:
# we are looking in something, find that first
container = caller.search(self.rhs)
if not container:
return
target = caller.search(self.lhs, location=container)
if not target:
return
target = caller.search(self.lhs, location=container)
if not target:
return
desc = caller.at_look(target)
# add the type=look to the outputfunc to make it

5
evennia/contrib/game_systems/containers/tests.py
View file

@ -31,6 +31,9 @@ class TestContainerCmds(BaseEvenniaCommandTest):
# move it into a non-container object and look at it there too
self.obj1.location = self.obj2
self.call(CmdContainerLook(), "obj in obj2", "Obj")
# make sure normal looking works too
self.call(CmdContainerLook(), "obj2", "Obj2")
self.call(CmdContainerLook(), "", "Room")
def test_get_and_put(self):
# get normally
@ -59,4 +62,4 @@ class TestContainerCmds(BaseEvenniaCommandTest):
self.obj1.location = self.char1
self.call(CmdPut(), "obj in box", "You can't fit anything else in a Box.")