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

Fix some erroneous lock access calls in earlier commit.

Browse source
This commit is contained in:
Griatch 2016-10-22 23:03:10 +02:00
parent fd27442c39
commit 5021563704
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
evennia/commands/default/building.py
View file

@ -144,7 +144,7 @@ class CmdSetObjAlias(COMMAND_DEFAULT_CLASS):
caller.msg("No aliases exist for '%s'." % obj.get_display_name(caller)) caller.msg("No aliases exist for '%s'." % obj.get_display_name(caller))
return return
if not obj.access(caller, "control") or obj.access(caller, 'edit'): if not (obj.access(caller, "control") or obj.access(caller, 'edit')):
caller.msg("You don't have permission to do that.") caller.msg("You don't have permission to do that.")
return return
@ -648,7 +648,7 @@ class CmdDestroy(COMMAND_DEFAULT_CLASS):
self.caller.msg(" (Objects to destroy must either be local or specified with a unique #dbref.)") self.caller.msg(" (Objects to destroy must either be local or specified with a unique #dbref.)")
return "" return ""
objname = obj.name objname = obj.name
if not obj.access(caller, 'delete'): if not (obj.access(caller, "control") or obj.access(caller, 'delete')):
return "\nYou don't have permission to delete %s." % objname return "\nYou don't have permission to delete %s." % objname
if obj.player and not 'override' in self.switches: if obj.player and not 'override' in self.switches:
return "\nObject %s is controlled by an active player. Use /override to delete anyway." % objname return "\nObject %s is controlled by an active player. Use /override to delete anyway." % objname
@ -1145,7 +1145,7 @@ class CmdName(ObjManipCommand):
if not newname: if not newname:
caller.msg("No name defined!") caller.msg("No name defined!")
return return
if not obj.access(caller, "control") or obj.access(caller, "edit"): if not (obj.access(caller, "control") or obj.access(caller, "edit")):
caller.mgs("You don't have right to edit this player %s." % obj) caller.mgs("You don't have right to edit this player %s." % obj)
return return
obj.username = newname obj.username = newname
@ -1165,7 +1165,7 @@ class CmdName(ObjManipCommand):
if not newname and not aliases: if not newname and not aliases:
caller.msg("No names or aliases defined!") caller.msg("No names or aliases defined!")
return return
if not obj.access(caller, "control") or obj.access(caller, "edit"): if not (obj.access(caller, "control") or obj.access(caller, "edit")):
caller.msg("You don't have the right to edit %s." % obj) caller.msg("You don't have the right to edit %s." % obj)
return return
# change the name and set aliases: # change the name and set aliases:
@ -1631,7 +1631,7 @@ class CmdTypeclass(COMMAND_DEFAULT_CLASS):
self.switches.append("force") self.switches.append("force")
self.switches.append("update") self.switches.append("update")
if not obj.access(caller, "control") or obj.access(caller, 'edit'): if not (obj.access(caller, "control") or obj.access(caller, 'edit')):
caller.msg("You are not allowed to do that.") caller.msg("You are not allowed to do that.")
return return
@ -1706,7 +1706,7 @@ class CmdWipe(ObjManipCommand):
obj = caller.search(objname) obj = caller.search(objname)
if not obj: if not obj:
return return
if not obj.access(caller, "control") or obj.access(caller, 'edit'): if not (obj.access(caller, "control") or obj.access(caller, 'edit')):
caller.msg("You are not allowed to do that.") caller.msg("You are not allowed to do that.")
return return
if not attrs: if not attrs:
@ -1776,7 +1776,7 @@ class CmdLock(ObjManipCommand):
string = "" string = ""
if lockdef: if lockdef:
if 'del' in self.switches: if 'del' in self.switches:
if not obj.access(caller, 'control') or obj.access(caller, "edit"): if not (obj.access(caller, 'control') or obj.access(caller, "edit")):
caller.msg("You are not allowed to do that.") caller.msg("You are not allowed to do that.")
return return
obj.locks.delete(access_type) obj.locks.delete(access_type)
@ -1801,7 +1801,7 @@ class CmdLock(ObjManipCommand):
obj = caller.search(objname) obj = caller.search(objname)
if not obj: if not obj:
return return
if not obj.access(caller, 'control'): if not (obj.access(caller, 'control') or obj.access(caller, "edit")):
caller.msg("You are not allowed to do that.") caller.msg("You are not allowed to do that.")
return return
ok = False ok = False