diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java index 0cd1362a..6dd9d2d0 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java @@ -685,6 +685,16 @@ public void onBlockForm(BlockFormEvent event) { int type = event.getNewState().getTypeId(); + if (event instanceof EntityBlockFormEvent) { + if (((EntityBlockFormEvent) event).getEntity() instanceof Snowman) { + if (wcfg.disableSnowmanTrails) { + event.setCancelled(true); + return; + } + } + return; + } + if (type == BlockID.ICE) { if (wcfg.disableIceFormation) { event.setCancelled(true); @@ -718,27 +728,6 @@ public void onBlockForm(BlockFormEvent event) { } } - /* - * Called when a block is formed by an entity. - */ - @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) - public void onEntityBlockForm(EntityBlockFormEvent event) { - ConfigurationManager cfg = plugin.getGlobalStateManager(); - WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld()); - - if (cfg.activityHaltToggle) { - event.setCancelled(true); - return; - } - - if (event.getEntity() instanceof Snowman) { - if (wcfg.disableSnowmanTrails) { - event.setCancelled(true); - return; - } - } - } - /* * Called when a block spreads based on world conditions. */