diff options
author | Dico <dico.karssiens@gmail.com> | 2014-07-17 04:54:44 +0200 |
---|---|---|
committer | Dico <dico.karssiens@gmail.com> | 2014-07-17 04:54:44 +0200 |
commit | 9f6186ad154b0e79390b5aeacf0ed195de44fd50 (patch) | |
tree | 1a082bfacbd9f46229d2f801ea6708134c51a23d /forcefield.py | |
parent | eab60c5502dc54273b21afa2dc62b5d217e748b6 (diff) |
Minor change
Diffstat (limited to 'forcefield.py')
-rw-r--r-- | forcefield.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/forcefield.py b/forcefield.py index b22ac63..480cdd5 100644 --- a/forcefield.py +++ b/forcefield.py @@ -129,12 +129,11 @@ def on_move(event): player_id = str(player.getUniqueId()) if player_id in ff_users: # player has forcefield, entity should be blocked for entity in player.getNearbyEntities(fd, fd, fd): - #if is_player(entity) and is_creative(entity) and not entity.hasPermission(ff_perms[1]) and not (player_id in whitelists.get(str(entity.getUniqueId()), [])): - if is_player(entity) and is_creative(entity) and not (str(entity.getUniqueId()) in whitelists.get(player_id, [])): + if is_player(entity) and is_creative(entity) and not entity.hasPermission(ff_perms[1]) and not (player_id in whitelists.get(str(entity.getUniqueId()), [])): #if not whitelists[entity_id], check in blank list e.g. False set_velocity_away(player, entity) - if not False: #player.hasPermission(ff_perms[1]): # player should be blocked, 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 is_player(entity) and is_creative(entity) and (entity_id in ff_users) and not (player_id in whitelists.get(entity_id, [])): |