Redstoner/redstoner-utils
Archived
0
Fork 0
Code Issues 6 Pull Requests Wiki Activity

Small fixes and tweaks

Browse Source
This commit is contained in:
Dico
2014-07-19 01:51:29 +02:00
parent 231a5b8322
commit 775bdc6205
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
forcefield.py
View File

@@ -3,13 +3,15 @@ from helpers import *
from org.bukkit.util import Vector from org.bukkit.util import Vector
from math import sin from math import sin
ff_perm = "utils.forcefield" ff_perm = "utils.forcefield"
pass_perm = "utils.forcefield.ignore" pass_perm = "utils.forcefield.ignore"
ff_prefix = "&8[&bFF&8] " ff_prefix = "&8[&bFF&8] "
ff_users = [] ff_users = []
whitelists = {} # {ff_owner_id: [white, listed, ids]} fd = 6 # forcefield distance
fd = 6 # forcefield distance Xv = 2.95 / fd # used in move_away(), this is more efficient.
Xv = 2.95 / fd # used in move_away(), this is more efficient. whitelists_filename = "plugins/redstoner-utils.py.dir/files/forcefield.json"
whitelists = {} # {ff_owner_id: [white, listed, ids]} (Adding file usage later, should be simple but just not yet.)
# /ff admin is a future option I might implement # /ff admin is a future option I might implement
@@ -144,28 +146,26 @@ def forcefield_header(player, message):
@hook.event("player.PlayerMoveEvent") @hook.event("player.PlayerMoveEvent")
def on_move(event): def on_move(event):
if not ff_users: if ff_users:
return player = event.getPlayer()
player = event.getPlayer() if is_creative(player):
log(player) player_id = uid(player)
if is_creative(player):
player_id = uid(player)
# moving player has forcefield, nearby player should be moved away # moving player has forcefield, nearby player should be moved away
if player_id in ff_users: if player_id in ff_users:
for entity in player.getNearbyEntities(fd, fd, fd): for entity in player.getNearbyEntities(fd, fd, fd):
whitelisted = (uid(entity) 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: if is_player(entity) and not entity.hasPermission(pass_perm) and not whitelisted:
move_away(player, entity) move_away(player, entity)
# nearby player has forcefield, moving player should be moved away # nearby player has forcefield, moving player should be moved away
if not player.hasPermission(pass_perm): if not player.hasPermission(pass_perm):
for entity in player.getNearbyEntities(fd, fd, fd): for entity in player.getNearbyEntities(fd, fd, fd):
entity_id = uid(entity) entity_id = uid(entity)
ff_enabled = (entity_id in ff_users) ff_enabled = (entity_id in ff_users)
whitelisted = (player_id in whitelists.get(entity_id, [])) whitelisted = (player_id in whitelists.get(entity_id, []))
if is_player(entity) and is_creative(entity) and ff_enabled and not whitelisted: if is_player(entity) and is_creative(entity) and ff_enabled and not whitelisted:
move_away(entity, player) move_away(entity, player)
def move_away(player, entity): def move_away(player, entity):