use better names, fix bugs

1 files changed, 48 insertions, 45 deletions

diff --git a/forcefield.py b/forcefield.py
index 236d683..ca10acf 100644
--- a/forcefield.py
+++ b/forcefield.py
@@ -1,16 +1,16 @@
 from helpers import *
 from java.util.UUID import fromString as java_uuid
 
-forcefield_permissions = ["utils.forcefield", "utils.forcefield.ignore"]
-forcefield_prefix      = "&8[&aFF&8]"
-forcefield_toggle      = []
-forcefield_whitelist   = {}
-fd                     = 4 # forcefield distance
+ff_perms   = ["utils.forcefield", "utils.forcefield.ignore"]
+ff_prefix  = "&8[&aFF&8]"
+ff_users   = []
+whitelists = {} # {ff_owner_id: [white, listed, ids]}
+fd         = 4  # forcefield distance
 
 
 @hook.command("forcefield")
 def on_forcefield_command(sender, args):
-  if not is_player(sender) or not sender.hasPermission(forcefield_permissions[0]):
+  if not is_player(sender) or not sender.hasPermission(ff_perms[0]):
     noperm(sender)
     return True
   sender_id = str(sender.getUniqueId())
@@ -39,9 +39,9 @@ def on_forcefield_command(sender, args):
 
 def whitelist_add(sender, sender_id, add, players):
   if not players:
-    msg(sender, "%s &cGive space-separated playernames." % forcefield_prefix)
-  elif add == True and sender_id not in forcefield_whitelist:
-    forcefield_whitelist[sender_id] = []
+    msg(sender, "%s &cGive space-separated playernames." % ff_prefix)
+  elif add == True and sender_id not in whitelists:
+    whitelists[sender_id] = []
   online_players = []
   for name in list(server.getOnlinePlayers()):
     online_players.append(str(name).lower())
@@ -53,48 +53,48 @@ def whitelist_add(sender, sender_id, add, players):
     if not player == None:
       uid = str(player.getUniqueId())
       pname = player.getDisplayName()
-      if add == True and uid not in forcefield_whitelist[sender_id]:
+      if add == True and uid not in whitelists[sender_id]:
         if player == sender:
-          msg(sender, "%s &cYou can't whitelist yourself." % forcefield_prefix)
+          msg(sender, "%s &cYou can't whitelist yourself." % ff_prefix)
         else:
-          forcefield_whitelist[sender_id].append(uid)
-          msg(sender, "%s &aAdded %s to your forcefield whitelist." % (forcefield_prefix, pname))
+          whitelists[sender_id].append(uid)
+          msg(sender, "%s &aAdded %s to your forcefield whitelist." % (ff_prefix, pname))
           if online == True:
-            msg(player, "%s %s &aAdded you to his forcefield whitelist." % (forcefield_prefix, sender.getDisplayName()))
-      elif add == False and uid in forcefield_whitelist[sender_id]:
-        forcefield_whitelist[sender_id].remove(uid)
-        msg(sender, "%s &cRemoved %s from your forcefield whitelist." % (forcefield_prefix, pname))
+            msg(player, "%s %s &aAdded you to his forcefield whitelist." % (ff_prefix, sender.getDisplayName()))
+      elif add == False and uid in whitelists[sender_id]:
+        whitelists[sender_id].remove(uid)
+        msg(sender, "%s &cRemoved %s from your forcefield whitelist." % (ff_prefix, pname))
         if online == True:
-          msg(player, "%s %s &cRemoved you from his forcefield whitelist." % (forcefield_prefix, sender.getDisplayName()))
+          msg(player, "%s %s &cRemoved you from his forcefield whitelist." % (ff_prefix, sender.getDisplayName()))
       elif add == True:
-        msg(sender, "%s &c%s &cWas already in your forcefield whitelist." % (forcefield_prefix, pname))
+        msg(sender, "%s &c%s &cWas already in your forcefield whitelist." % (ff_prefix, pname))
       else:
-        msg(sender, "%s &c%s &cWas not in your forcefield whitelist." % (forcefield_prefix, pname))
+        msg(sender, "%s &c%s &cWas not in your forcefield whitelist." % (ff_prefix, pname))
     else:
-      msg(sender, "%s &cplayer %s &cwas not found." % (forcefield_prefix, name))
+      msg(sender, "%s &cplayer %s &cwas not found." % (ff_prefix, name))
 
 
 def whitelist_list(sender, sender_id):
-  msg(sender, "%s &aForceField Whitelist:" % forcefield_prefix)
-  if not sender_id in forcefield_whitelist or len(forcefield_whitelist[sender_id]) == 0:
+  msg(sender, "%s &aForceField Whitelist:" % ff_prefix)
+  if not sender_id in whitelists or len(whitelists[sender_id]) == 0:
     msg(sender, "&c      Your whitelist has no entries.")
   else:
     c = 0
-    for uid in forcefield_whitelist[sender_id]:
+    for uid in whitelists[sender_id]:
       c+=1
       msg(sender, "&a      %s. &f%s" % (c, server.getPlayer(java_uuid(uid)).getDisplayName()))
 
 
 def whitelist_clear(sender, sender_id):
-  if len(forcefield_whitelist[sender_id]) == 0:
-    msg(sender, "%s &cYou had no players whitelisted." % forcefield_prefix)
+  if len(whitelists[sender_id]) == 0:
+    msg(sender, "%s &cYou had no players whitelisted." % ff_prefix)
   else:
-    forcefield_whitelist[sender_id] = []
-    msg(sender, "%s &aForceField Whitelist cleared." % forcefield_prefix)
+    whitelists[sender_id] = []
+    msg(sender, "%s &aForceField Whitelist cleared." % ff_prefix)
 
 
 def forcefield_help(sender):
-  msg(sender, "%s &a&l/ForceField Help: \n&aYou can use the forcefield to keep players on distance." % forcefield_prefix)
+  msg(sender, "%s &a&l/ForceField Help: \n&aYou can use the forcefield to keep players on distance." % ff_prefix)
   msg(sender, "&2Commands:")
   msg(sender, "&a1. &6/ff &ohelp &a: aliases: ?")
   msg(sender, "&a2. &6/ff &o(toggle)")
@@ -105,16 +105,16 @@ def forcefield_help(sender):
 
 
 def toggle_forcefield(sender, sender_id):
-  if sender_id in forcefield_toggle:
-    forcefield_toggle.remove(sender_id)
-    msg(sender, "%s &aForceField toggle: &cOFF" % forcefield_prefix)
+  if sender_id in ff_users:
+    ff_users.remove(sender_id)
+    msg(sender, "%s &aForceField toggle: &cOFF" % ff_prefix)
   else:
-    forcefield_toggle.append(sender_id)
-    msg(sender, "%s &aForceField toggle: &2ON" % forcefield_prefix)
+    ff_users.append(sender_id)
+    msg(sender, "%s &aForceField toggle: &2ON" % ff_prefix)
 
 
 def invalid_syntax(sender):
-  msg(sender, "%s &cInvalid syntax. Use &o/ff ? &cfor more info." % forcefield_prefix)
+  msg(sender, "%s &cInvalid syntax. Use &o/ff ? &cfor more info." % ff_prefix)
 
 
 #--------------------------------------------------------------------------------------------------------#
@@ -124,19 +124,22 @@ def invalid_syntax(sender):
 def on_move(event):
   player = event.getPlayer()
   player_id = str(player.getUniqueId())
-  if player_id in forcefield_toggle: #player has forcefield, entity should be launched
-    if not forcefield_whitelist[player_id]:
-      forcefield_whitelist[player_id] = []
+
+  if player_id in ff_users: # player has forcefield, entity should be blocked
+    if not whitelists[player_id]:
+      whitelists[player_id] = []
     for entity in player.getNearbyEntities(fd, fd, fd):
       log("%s" % entity.getName())
-      if is_player(entity) and not entity.hasPermission(forcefield_permissions[1]) and not str(entity.getUniqueId()) in forcefield_whitelist[player_id] and not entity == player:
+      if is_player(entity) and not entity.hasPermission(ff_perms[1]) and not str(entity.getUniqueId()) in whitelists[player_id] and not entity == player:
         set_velocity_away(player, entity)
-  if not player.hasPermission(forcefield_permissions[1]): #player should be launched, entity has forcefield
+
+  if not player.hasPermission(ff_perms[1]): # player should be blocked, entity has forcefield
     for entity in player.getNearbyEntities(fd, fd, fd):
       entity_id = str(entity.getUniqueId())
-      if not forcefield_whitelist[entity_id]:
-        forcefield_whitelist[entity_id] = []
-      if is_player(entity) and entity_id in forcefield_toggle and not player_id in forcefield_whitelist[entity_id] and not entity == player:
+      if not entity_id in whitelists:
+        whitelists[entity_id] = []
+
+      if is_player(entity) and entity_id in ff_users and not player_id in whitelists[entity_id]:
         if event.getFrom().distance(entity.getLocation()) > 4:
           event.setCancelled(True)
           msg(player, "&cYou may not get closer than %sm to %s &cdue to their forcefield." % (fd, entity.getDisplayName()))
@@ -161,5 +164,5 @@ def set_velocity_away(player, entity): #Moves entity away from player
 def on_quit(event):
   player = event.getPlayer()
   uid    = str(player.getUniqueId())
-  if uid in forcefield_toggle:
-    forcefield_toggle.remove(uid)
\ No newline at end of file
+  if uid in ff_users:
+    ff_users.remove(uid)
\ No newline at end of file