diff options
author | Dico <dico.karssiens@gmail.com> | 2014-07-14 13:38:26 +0200 |
---|---|---|
committer | Dico <dico.karssiens@gmail.com> | 2014-07-14 13:38:26 +0200 |
commit | c4e206f44e7e8b3e07b683bbd12ab9bb4df0254e (patch) | |
tree | 1d40c6544ab1d7f8ae9c368c02421247e336992a /forcefield.py | |
parent | cce3c028a458f3469faba78a6a8b4f7dca059d71 (diff) |
Unfixing fix
Diffstat (limited to 'forcefield.py')
-rw-r--r-- | forcefield.py | 73 |
1 files changed, 35 insertions, 38 deletions
diff --git a/forcefield.py b/forcefield.py index dbe2138..d6e5c4c 100644 --- a/forcefield.py +++ b/forcefield.py @@ -26,45 +26,42 @@ def onForceFieldCommand(sender, args): return True sender_id = str(sender.getUniqueId()) args = args.lower() - try: - if not args or args[0] == "toggle": #Toggle - if sender_id in forcefield_toggle: - forcefield_toggle.remove(sender_id) - msg(sender, "%s &aForceField toggle: &cOFF" % forcefield_prefix) - else: - forcefield_toggle.append(sender_id) - msg(sender, "%s &aForceField toggle: &2ON" % forcefield_prefix) - elif args[0] in ["whitelist", "wl", "wlist"]: #Whitelist commands - if not args[1] or args[1] == "list": - msg(sender, "%s &aForceField Whitelist:") % forcefield_prefix - c=0 - for uid in forcefield_whitelist[sender_id]: - c+=1 - msg(sender, "&a%s. &f%s") % (c, juuid(uid)) - elif args[1] == "clear": - forcefield_whitelist[sender_id] = [] - msg(sender, "%s &aForceField Whitelist cleared.") - elif args[1] in ["add", "+"]: - if not args[2:]: - msg(sender, "%s &cGive playernames to add to your whitelist." % forcefield_prefix) - else: - for name in args[2:]: - uid = str(server.getPlayer(name).getUniqueId()) - forcefield_whitelist[sender_id].append(uid) - elif args[1] in ["remove", "delete", "rem", "del", "-"]: - if not args[2:]: - msg(sender, "%s &cGive playernames to remove from your whitelist." % forcefield_prefix) - else: - for name in args[2:]: - uid = str(server.getPlayer(name).getUniqueId()) - forcefield_whitelist[sender_id].remove(uid) - elif args[0] in ["help", "?"]: #/forcefield help - forcefield_help(sender) + if not args or args[0] == "toggle": #Toggle + if sender_id in forcefield_toggle: + forcefield_toggle.remove(sender_id) + msg(sender, "%s &aForceField toggle: &cOFF" % forcefield_prefix) else: - msg(sender, "%s &cInvalid syntax. Use &o/ff ? &cfor more info.") - return True - except Exception, exception: - error("Error in Forcefield module: \n %s" % exception) + forcefield_toggle.append(sender_id) + msg(sender, "%s &aForceField toggle: &2ON" % forcefield_prefix) + elif args[0] in ["whitelist", "wl", "wlist"]: #Whitelist commands + if not args[1] or args[1] == "list": + msg(sender, "%s &aForceField Whitelist:") % forcefield_prefix + c=0 + for uid in forcefield_whitelist[sender_id]: + c+=1 + msg(sender, "&a%s. &f%s") % (c, juuid(uid)) + elif args[1] == "clear": + forcefield_whitelist[sender_id] = [] + msg(sender, "%s &aForceField Whitelist cleared.") + elif args[1] in ["add", "+"]: + if not args[2:]: + msg(sender, "%s &cGive playernames to add to your whitelist." % forcefield_prefix) + else: + for name in args[2:]: + uid = str(server.getPlayer(name).getUniqueId()) + forcefield_whitelist[sender_id].append(uid) + elif args[1] in ["remove", "delete", "rem", "del", "-"]: + if not args[2:]: + msg(sender, "%s &cGive playernames to remove from your whitelist." % forcefield_prefix) + else: + for name in args[2:]: + uid = str(server.getPlayer(name).getUniqueId()) + forcefield_whitelist[sender_id].remove(uid) + elif args[0] in ["help", "?"]: #/forcefield help + forcefield_help(sender) + else: + msg(sender, "%s &cInvalid syntax. Use &o/ff ? &cfor more info.") + return True def setVelocityAway(player, entity): player_loc = player.getLocation() |