summaryrefslogtreecommitdiff
path: root/forcefield.py
diff options
context:
space:
mode:
authorDico <dico.karssiens@gmail.com>2014-07-17 15:26:48 +0200
committerDico <dico.karssiens@gmail.com>2014-07-17 15:26:48 +0200
commit372a831c82977e6d079337ff38cc03154914a2b0 (patch)
tree37ee3201bed50639faa22ab786752baf52306324 /forcefield.py
parent2c1c6928a975b7a6845dcc06adfec121fe24446a (diff)
Converted reports module to UUID and minor changes to forcefield module
Diffstat (limited to 'forcefield.py')
-rw-r--r--forcefield.py18
1 files changed, 7 insertions, 11 deletions
diff --git a/forcefield.py b/forcefield.py
index 7a48931..777c974 100644
--- a/forcefield.py
+++ b/forcefield.py
@@ -1,7 +1,6 @@
from helpers import *
-from java.util.UUID import fromString as java_uuid
+from java.util.UUID import fromString as id_to_player
from org.bukkit.util import Vector
-from traceback import format_exc as print_traceback
ff_perms = ["utils.forcefield", "utils.forcefield.ignore"]
ff_prefix = "&8[&aFF&8]"
@@ -76,15 +75,12 @@ def whitelist_add(sender, add, players):
def whitelist_list(sender):
sender_id = str(sender.getUniqueId())
msg(sender, "%s &aForceField Whitelist:" % ff_prefix)
- try:
- count = 0
- for player_id in whitelists.get(sender_id, []):
- count += 1
- msg(sender, "&a %s. &f%s" % (count, server.getOfflinePlayer(java_uuid(player_id)).getName()))
- if count == 0:
- msg(sender, "&c Your whitelist has no entries.")
- except:
- log(print_traceback())
+ count = 0
+ for player_id in whitelists.get(sender_id, []):
+ count += 1
+ msg(sender, "&a %s. &f%s" % (count, server.getOfflinePlayer(id_to_player(player_id)).getName()))
+ if count == 0:
+ msg(sender, "&c Your whitelist has no entries.")
def whitelist_clear(sender):