Dev #29

Closed
Evanus wants to merge 13 commits from dev into dev
Showing only changes of commit e65197d3a9 - Show all commits

View File

@ -4,6 +4,7 @@ from helpers import *
from org.bukkit.util import Vector from org.bukkit.util import Vector
from math import sin from math import sin
ff_help = "utils.forcefeild.help"
ff_perm = "utils.forcefield" ff_perm = "utils.forcefield"
pass_perm = "utils.forcefield.ignore" pass_perm = "utils.forcefield.ignore"
ff_prefix = "&8[&bFF&8] " ff_prefix = "&8[&bFF&8] "
@ -42,7 +43,7 @@ def on_forcefield_command(sender, command, label, args):
else: else:
forcefield_header(sender, "&cInvalid syntax. Use &e/ff ? &cfor info.") forcefield_header(sender, "&cInvalid syntax. Use &e/ff ? &cfor info.")
elif args[0] in ["HELP", "?"]: # /forcefield help elif args[0] in ["HELP", "?"] and sender.hasPermission(ff_help): # /forcefield help
forcefield_help(sender) forcefield_help(sender)
else: else:
forcefield_header(sender, "&cInvalid syntax. Use &e/ff ? &cfor info.") forcefield_header(sender, "&cInvalid syntax. Use &e/ff ? &cfor info.")
@ -194,4 +195,4 @@ def on_quit(event):
player = event.getPlayer() player = event.getPlayer()
player_id = uid(player) player_id = uid(player)
if player_id in ff_users: if player_id in ff_users:
ff_users.remove(player_id) ff_users.remove(player_id)