diff options
| -rw-r--r-- | main.py | 2 | ||||
| -rw-r--r-- | serversigns.py | 41 | ||||
| -rw-r--r-- | sync.py | 21 |
3 files changed, 44 insertions, 20 deletions
@@ -23,6 +23,8 @@ def on_enable(): shared["modules"]["blockplacemods"].schedule_torch_breaker() if "imbusy" in shared["modules"]: shared["modules"]["imbusy"].replace_ess_commands() + if "serversigns" in shared["modules"]: + shared["modules"]["serversigns"].check_all_signs() info("RedstonerUtils enabled!") diff --git a/serversigns.py b/serversigns.py index d5a4829..c5238e1 100644 --- a/serversigns.py +++ b/serversigns.py @@ -266,8 +266,6 @@ def svs_command(sender, command, label, args): #------------------------------------------------------------------------------------------------------- - - @hook.event("player.PlayerInteractEvent") def on_click(event): if str(event.getAction()) != "RIGHT_CLICK_BLOCK": @@ -297,39 +295,37 @@ faces = { @hook.event("block.BlockBreakEvent", "monitor") def on_break(event): - try: - global checking_block - if checking_block or event.isCancelled(): - return + if checking_block or event.isCancelled(): + return - block = event.getBlock() - if block.getType() in (Material.SIGN_POST, Material.WALL_SIGN): - check_sign(event, block, attached = False) + block = event.getBlock() + if block.getType() in (Material.SIGN_POST, Material.WALL_SIGN): + check_sign(event, block, attached = False) - for block_face, data_values in faces.iteritems(): - block2 = block.getRelative(block_face) - if block2.getType() == Material.WALL_SIGN and block2.getData() in data_values: - check_sign(event, block2) + for block_face, data_values in faces.iteritems(): + block2 = block.getRelative(block_face) + if block2.getType() == Material.WALL_SIGN and block2.getData() in data_values: + check_sign(event, block2) - block3 = block.getRelative(BlockFace.UP) - if block3.getType() == Material.SIGN_POST: - check_sign(event, block3) - except: - error(trace()) + block3 = block.getRelative(BlockFace.UP) + if block3.getType() == Material.SIGN_POST: + check_sign(event, block3) def check_sign(event, block, attached = True): player = event.getPlayer() - sign = getSign(fromLoc(block.getLocation())) + loc = fromLoc(block.getLocation()) + if block.getType() not in (Material.WALL_SIGN, Material.SIGN_POST) or getSign(loc) is None: + return if not can_build2(player, block): event.setCancelled(True) msg(event.getPlayer(), signsMsg("You cannot break %s" % ("the sign attached to that block" if attached else "that sign"))) else: - loc = fromLoc(block.getLocation()) del signs[loc] save_signs() msg(player, signsMsg("Reset the %s which you just broke" % identifySign(loc))) + def can_build2(player, block): global checking_block event = BlockBreakEvent(block, player) @@ -338,3 +334,8 @@ def can_build2(player, block): checking_block = False return not event.isCancelled() + +def check_all_signs(): + for loc in signs: + if server.getWorld(loc[0]).getBlockAt(loc[1], loc[2], loc[3]).getType() not in (Material.WALL_SIGN, Material.SIGN_POST): + del signs[loc] @@ -0,0 +1,21 @@ +from helpers import * +from java.lang import Runnable + +class Sync_class(Runnable): + + def __init__(self,function,*args,**kwargs): + self.function = function + self.args = args + self.kwargs = kwargs + + def run(self): + self.function(self.args,self.kwargs) + + + +def sync(function): + def wrapper(*args,**kwargs): + sync_function = Sync_class(function) + server.getScheduler().runTask(server.getPluginManager().getPlugin("RedstonerUtils"),sync_function) + return None + return wrapper
\ No newline at end of file |