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

Fixing bugs

Browse Source
This commit is contained in:
Dico
2014-07-14 13:32:37 +02:00
parent fa0823b15b
commit 4b19546c13
1 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forcefield.py
View File

@@ -1,4 +1,3 @@
from helpers import * from helpers import *
from java.util.UUID import fromString as juuid from java.util.UUID import fromString as juuid
@@ -27,6 +26,7 @@ def onForceFieldCommand(sender, args):
return True return True
sender_id = str(sender.getUniqueId()) sender_id = str(sender.getUniqueId())
args = args.lower() args = args.lower()
try:
if not args or args[0] == "toggle": #Toggle if not args or args[0] == "toggle": #Toggle
if sender_id in forcefield_toggle: if sender_id in forcefield_toggle:
forcefield_toggle.remove(sender_id) forcefield_toggle.remove(sender_id)
@@ -44,7 +44,7 @@ def onForceFieldCommand(sender, args):
elif args[1] == "clear": elif args[1] == "clear":
forcefield_whitelist[sender_id] = [] forcefield_whitelist[sender_id] = []
msg(sender, "%s &aForceField Whitelist cleared.") msg(sender, "%s &aForceField Whitelist cleared.")
elif args[1] in ["add", "+"] elif args[1] in ["add", "+"]:
if not args[2:]: if not args[2:]:
msg(sender, "%s &cGive playernames to add to your whitelist." % forcefield_prefix) msg(sender, "%s &cGive playernames to add to your whitelist." % forcefield_prefix)
else: else:
@@ -63,6 +63,8 @@ def onForceFieldCommand(sender, args):
else: else:
msg(sender, "%s &cInvalid syntax. Use &o/ff ? &cfor more info.") msg(sender, "%s &cInvalid syntax. Use &o/ff ? &cfor more info.")
return True return True
except Exception, exception:
error("Error in Forcefield module: \n %s" % exception)
def setVelocityAway(player, entity): def setVelocityAway(player, entity):
player_loc = player.getLocation() player_loc = player.getLocation()
@@ -90,6 +92,3 @@ def onMove(event):
msg(player, "&cYou may not get closer than %sm to %s due to their forcefield." % (fd, entity.getDisplayName())) msg(player, "&cYou may not get closer than %sm to %s due to their forcefield." % (fd, entity.getDisplayName()))
else: else:
setVelocityAway(entity, player) setVelocityAway(entity, player)