use uid(player) helper method

10 files changed, 32 insertions, 28 deletions

diff --git a/README.md b/README.md
index 2ef70db..d953861 100644
--- a/README.md
+++ b/README.md
@@ -190,7 +190,7 @@ foo = int(player_data[str(server.getPlayer(args[4]).getUniqueId())]["details"].[
 
 # good
 player     = server.getPlayer(args[4])
-player_id  = str(player.getUniqueId())
+player_id  = uid(player)
 logintime  = player_data[played_id]["last_login"]
 epoch_time = int(logintime.strftime("%s"))
 ```
diff --git a/chatgroups.py b/chatgroups.py
index 76eb8b2..1129509 100644
--- a/chatgroups.py
+++ b/chatgroups.py
@@ -18,7 +18,7 @@ except Exception, e:
 def on_chatgroup_command(sender, args):
   try:
     plugin_header(sender, "ChatGroups")
-    sender_id = str(sender.getUniqueId())
+    sender_id = uid(sender)
     if len(args) == 1 and args[0] == "leave":
       if sender_id in groups.keys():
         groupchat(sender, "left the group", True)
@@ -57,7 +57,7 @@ def on_chatgroup_command(sender, args):
 
 @hook.command("cgt")
 def on_cgt_command(sender, args):
-  p = str(sender.getUniqueId())
+  p = uid(sender)
   if p in cg_toggle_list:
     cg_toggle_list.remove(p)
     msg(sender, "&8[&bCG&8] &e&oCG toggle: off")
@@ -69,7 +69,7 @@ def on_cgt_command(sender, args):
 
 def groupchat(sender, message, ann = False):
   #try:
-  group = groups.get(str(sender.getUniqueId()))
+  group = groups.get(uid(sender))
   if group == None:
     msg(sender, "&cYou are not in a group!")
     return
@@ -80,7 +80,7 @@ def groupchat(sender, message, ann = False):
     mesg = "&8[&bCG&8] &f%s&f: &6%s" % (name, message)
   log("[ChatGroups] %s (%s): %s" % (sender, group, message))
   for receiver in server.getOnlinePlayers():
-    groups.get(str(receiver.getUniqueId())) == group and msg(receiver, mesg)
+    groups.get(uid(receiver)) == group and msg(receiver, mesg)
   #except Exception, e:
   #  error(e)
 
@@ -99,7 +99,7 @@ def on_chat(event):
   sender = event.getPlayer()
   msge = event.getMessage()
   if not event.isCancelled():
-    sender_id = str(sender.getUniqueId())
+    sender_id = uid(sender)
     if msge[:len(cg_key)] == cg_key and sender_id in groups.keys():
       groupchat(sender, msge[1:])
       event.setCancelled(True)
diff --git a/cycle.py b/cycle.py
index eba8630..7795f23 100644
--- a/cycle.py
+++ b/cycle.py
@@ -20,7 +20,7 @@ def on_cycler_command(sender, args):
     return True
 
   cmd = args[0].lower()
-  pid = str(sender.getUniqueId())
+  pid = uid(sender)
   nop = pid in no_cyclers
   if cmd == "on":
     if nop:
@@ -44,7 +44,7 @@ def on_cycler_command(sender, args):
 @hook.event("player.PlayerItemHeldEvent", "normal")
 def on_slot_change(event):
   player    = event.getPlayer()
-  if is_creative(player) and str(player.getUniqueId()) not in no_cyclers and not player.isSneaking():
+  if is_creative(player) and uid(player) not in no_cyclers and not player.isSneaking():
     prev_slot = event.getPreviousSlot()
     new_slot  = event.getNewSlot()
     if (prev_slot == 0 and new_slot == 8): # left -> right
diff --git a/damnspam.py b/damnspam.py
index e74044a..1a93ae4 100644
--- a/damnspam.py
+++ b/damnspam.py
@@ -30,7 +30,7 @@ def location_str(block):
 def add_input(creator, block, timeout_off, timeout_on):
   global inputs
   inputs[location_str(block)] = {
-    "creator"     : str(creator.getUniqueId()),
+    "creator"     : uid(creator),
     "timeout_off" : timeout_off,
     "timeout_on"  : timeout_on,
     "last_time"   : 0
diff --git a/forcefield.py b/forcefield.py
index b70d0bb..2cdfe5b 100644
--- a/forcefield.py
+++ b/forcefield.py
@@ -53,14 +53,14 @@ def on_forcefield_command(sender, args):
 
 def change_whitelist(sender, add, names):
   if names:
-    sender_id = str(sender.getUniqueId())
+    sender_id = uid(sender)
     if sender_id not in whitelists:
       whitelists[sender_id] = []
 
     for name in names:
       player = server.getOfflinePlayer(name)
       if player:
-        player_id = str(player.getUniqueId())
+        player_id = uid(player)
         pname     = player.getName()
         sname     = sender.getDisplayName()
 
@@ -86,7 +86,7 @@ def change_whitelist(sender, add, names):
 
 
 def whitelist_list(sender):
-  sender_id = str(sender.getUniqueId())
+  sender_id = uid(sender)
   count     = 0
   msg(sender, "%s &aForceField Whitelist:" % ff_prefix)
   for player_id in whitelists.get(sender_id, []):
@@ -97,7 +97,7 @@ def whitelist_list(sender):
 
 
 def whitelist_clear(sender):
-  sender_id = str(sender.getUniqueId())
+  sender_id = uid(sender)
   if whitelists.get(sender_id):
     whitelists.pop(sender_id)
     msg(sender, "%s &aForceField Whitelist cleared." % ff_prefix)
@@ -118,7 +118,7 @@ def forcefield_help(sender):
 
 
 def forcefield_toggle(sender):
-  sender_id = str(sender.getUniqueId())
+  sender_id = uid(sender)
   if sender_id in ff_users:
     ff_users.remove(sender_id)
     msg(sender, "%s &aForceField toggle: &cOFF" % ff_prefix)
@@ -156,19 +156,19 @@ def move_away(player, entity):
 def on_move(event):
   player = event.getPlayer()
   if is_creative(player):
-    player_id = str(player.getUniqueId())
+    player_id = uid(player)
 
     # moving player has forcefield, nerby player should be moved away
     if player_id in ff_users:
       for entity in player.getNearbyEntities(fd, fd, fd):
-        whitelisted = (str(entity.getUniqueId()) in whitelists.get(player_id, []))
+        whitelisted = (uid(entity) in whitelists.get(player_id, []))
         if is_player(entity) and not entity.hasPermission(pass_perm) and not whitelisted:
           move_away(player, entity)
 
     # nerby player has forcefield, moving player should be moved away
     if player.hasPermission(pass_perm):
       for entity in player.getNearbyEntities(fd, fd, fd):
-        entity_id   = str(entity.getUniqueId())
+        entity_id   = uid(entity)
         ff_enabled  = (entity_id in ff_users)
         whitelisted = (player_id in whitelists.get(entity_id, []))
         if is_player(entity) and is_creative(entity) and ff_enabled and not whitelisted:
@@ -181,6 +181,6 @@ def on_move(event):
 @hook.event("player.PlayerQuitEvent")
 def on_quit(event):
   player = event.getPlayer()
-  uid    = str(player.getUniqueId())
+  uid    = uid(player)
   if uid in ff_users:
     ff_users.remove(uid)
\ No newline at end of file
diff --git a/helpers.py b/helpers.py
index 2546cc8..b1bea72 100644
--- a/helpers.py
+++ b/helpers.py
@@ -98,4 +98,8 @@ def warp(player, args, warpname):
 
 
 def is_creative(player):
-  return str(player.getGameMode()) == "CREATIVE"
\ No newline at end of file
+  return str(player.getGameMode()) == "CREATIVE"
+
+
+def uid(player):
+  return str(player.get-removeme-UniqueId())
\ No newline at end of file
diff --git a/mentio.py b/mentio.py
index 638eaf9..ab1cc2d 100644
--- a/mentio.py
+++ b/mentio.py
@@ -50,8 +50,8 @@ def on_chat(event):
 def on_listen_command(sender, args):
   try:
     currWords = []
-    if str(sender.getUniqueId()) in mentions.keys():
-      currWords = mentions[str(sender.getUniqueId())]
+    if uid(sender) in mentions.keys():
+      currWords = mentions[uid(sender)]
 
     # /listen add <word>
     if len(args) == 2 and args[0].lower() == "add":
@@ -65,7 +65,7 @@ def on_listen_command(sender, args):
       if args[1].lower() is sender.getName():
         msg(sender, "&cYou are always listening for your full ingame name by default")
       currWords.append(args[1].lower())
-      mentions[str(sender.getUniqueId())] = currWords
+      mentions[uid(sender)] = currWords
       msg(sender, "&aYou are now listening for '&2"+args[1].lower()+"'!")
       save_mentions()
       return True
@@ -78,7 +78,7 @@ def on_listen_command(sender, args):
       for word in currWords[:]:
         if word.lower() == args[1].lower():
           currWords.remove(word.lower())
-          mentions[str(sender.getUniqueId())] = currWords
+          mentions[uid(sender)] = currWords
           success = True
       if success == True:
         save_mentions()
diff --git a/misc.py b/misc.py
index ef9e889..9d0d15c 100644
--- a/misc.py
+++ b/misc.py
@@ -85,7 +85,7 @@ def on_player_entity_interact(event):
       last_shear = shear_time
       sender = event.getPlayer()
       entity = event.getRightClicked()
-      if is_player(entity) and str(entity.getUniqueId()) == "ae795aa8-6327-408e-92ab-25c8a59f3ba1" and str(sender.getItemInHand().getType()) == "SHEARS" and is_creative(sender):
+      if is_player(entity) and uid(entity) == "ae795aa8-6327-408e-92ab-25c8a59f3ba1" and str(sender.getItemInHand().getType()) == "SHEARS" and is_creative(sender):
         for i in range(5):
           entity.getWorld().dropItemNaturally(entity.getLocation(), ItemStack(bukkit.Material.getMaterial("REDSTONE")))
           entity.getWorld().dropItemNaturally(entity.getLocation(), ItemStack(bukkit.Material.getMaterial("WOOL")))
diff --git a/reports.py b/reports.py
index 2d898aa..a4fb504 100644
--- a/reports.py
+++ b/reports.py
@@ -103,7 +103,7 @@ def on_report_command(sender, args):
   text = " ".join(args)
   loc = sender.getLocation()
   reporter = sender.name
-  reporter_id = str(sender.getUniqueId())
+  reporter_id = uid(sender)
   report = {
     "uuid": reporter_id,
     "msg": text,
diff --git a/tilehelper.py b/tilehelper.py
index 0258131..e8c2af6 100644
--- a/tilehelper.py
+++ b/tilehelper.py
@@ -35,7 +35,7 @@ def on_place_block(event):
     block  = event.getBlockPlaced()
     for th in tilehelpers:
       area = th.get("area")
-      if th.get("owner") == str(player.getUniqueId()) and str(block.getWorld().getUID()) == th.get("world") and block.getX() in range(area[0][0], area[0][1]+1) and block.getY() in range(area[1][0], area[1][1]+1) and block.getZ() in range(area[2][0], area[2][1]+1) and event.canBuild():
+      if th.get("owner") == uid(player) and str(block.getWorld().getUID()) == th.get("world") and block.getX() in range(area[0][0], area[0][1]+1) and block.getY() in range(area[1][0], area[1][1]+1) and block.getZ() in range(area[2][0], area[2][1]+1) and event.canBuild():
 
         # stack block in directions
         for direction in th.get("directions"):
@@ -76,7 +76,7 @@ def on_break_block(event):
     block  = event.getBlock()
     for th in tilehelpers:
       area = th.get("area")
-      if th.get("owner") == str(player.getUniqueId()) and str(block.getWorld().getUID()) == th.get("world") and block.getX() in range(area[0][0], area[0][1]+1) and block.getY() in range(area[1][0], area[1][1]+1) and block.getZ() in range(area[2][0], area[2][1]+1):
+      if th.get("owner") == uid(player) and str(block.getWorld().getUID()) == th.get("world") and block.getX() in range(area[0][0], area[0][1]+1) and block.getY() in range(area[1][0], area[1][1]+1) and block.getZ() in range(area[2][0], area[2][1]+1):
 
         # stack block in directions
         for direction in th.get("directions"):
@@ -107,7 +107,7 @@ def on_block_interact(event):
     block  = event.getClickedBlock()
     for th in tilehelpers:
       area = th.get("area")
-      if th.get("owner") == str(player.getUniqueId()) and str(block.getWorld().getUID()) == th.get("world") and block.getX() in range(area[0][0], area[0][1]+1) and block.getY() in range(area[1][0], area[1][1]+1) and block.getZ() in range(area[2][0], area[2][1]+1):
+      if th.get("owner") == uid(player) and str(block.getWorld().getUID()) == th.get("world") and block.getX() in range(area[0][0], area[0][1]+1) and block.getY() in range(area[1][0], area[1][1]+1) and block.getZ() in range(area[2][0], area[2][1]+1):
 
         # stack block in directions
         for direction in th.get("directions"):