Redstoner/redstoner-utils
Archived
0
Fork 0
Code Issues 6 Pull Requests Wiki Activity

Tiny tweaks in basecommands.py

Browse Source
This commit is contained in:
Dico200
2015-03-26 16:48:54 +01:00
parent 75823ed042
commit 4cfa3a598f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
basecommands.py
View File

@@ -33,9 +33,9 @@ def simplecommand(cmd,
def run(sender, command, label, args): def run(sender, command, label, args):
isPlayer = is_player(sender) isPlayer = is_player(sender)
if not isSenderValid(senderLimit, isPlayer): if not isSenderValid(senderLimit, isPlayer):
return "&cThis command can only be run from the console" if isplayer else "&cThis command can only be run by players" return invalidSenderMsg(isPlayer)
if not sender.hasPermission(permission): if not sender.hasPermission(permission):
return "&cYou do not have permission to use this command" return "&cYou do not have permission to use that command"
if ((not args) and helpNoargs) or (helpSubcmd and args and args[0].lower() == "help"): if ((not args) and helpNoargs) or (helpSubcmd and args and args[0].lower() == "help"):
return getHelp(sender) return getHelp(sender)
if not checkargs(sender, args, amin, amax): if not checkargs(sender, args, amin, amax):
@@ -96,7 +96,7 @@ def advancedcommand(cmd,
if not isSenderValid(called.senderLimit, isPlayer): if not isSenderValid(called.senderLimit, isPlayer):
return invalidSenderMsg(isPlayer) return invalidSenderMsg(isPlayer)
if not sender.hasPermission(called.permission): if not sender.hasPermission(called.permission):
return "&cYou do not have permission to use this command" return "&cYou do not have permission to use that command"
if not checkargs(sender, args[1:], called.amin, called.amax): if not checkargs(sender, args[1:], called.amin, called.amax):
return None return None
return called.call(sender, command, label, args) return called.call(sender, command, label, args)