From 375885bbde4e2bf607d4514ce23fcf8d171af675 Mon Sep 17 00:00:00 2001 From: jojo Date: Wed, 3 Feb 2021 19:37:52 +0100 Subject: [PATCH 1/2] Fix Sound of TNT ignite with freeze enabled --- .../bausystem/commands/CommandFreeze.java | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java index d456416..08097c3 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java @@ -60,24 +60,30 @@ public class CommandFreeze extends RegionToggleCommand { @EventHandler public void onEntitySpawn(EntitySpawnEvent e) { Region.getRegion(e.getLocation(), region -> { + if (region.isFreeze()) e.setCancelled(true); + }, () -> { + if (Region.NoRegion.freeze) e.setCancelled(true); + }); + } + + @EventHandler(ignoreCancelled = true) + public void onBlockCanBuild(BlockCanBuildEvent e) { + if (!e.isBuildable()) return; + Region.getRegion(e.getBlock().getLocation(), region -> { if (!region.isFreeze()) { return; } - e.setCancelled(true); - if (e.getEntityType() == EntityType.PRIMED_TNT) { - Bukkit.getScheduler().runTaskLater(BauSystem.getPlugin(), () -> { - e.getLocation().getBlock().setType(Material.TNT, false); - }, 1); + if (e.getMaterial() == Material.TNT) { + e.setBuildable(false); + e.getBlock().setType(Material.TNT, false); } }, () -> { if (!Region.NoRegion.freeze) { return; } - e.setCancelled(true); - if (e.getEntityType() == EntityType.PRIMED_TNT) { - Bukkit.getScheduler().runTaskLater(BauSystem.getPlugin(), () -> { - e.getLocation().getBlock().setType(Material.TNT, false); - }, 1); + if (e.getMaterial() == Material.TNT) { + e.setBuildable(false); + e.getBlock().setType(Material.TNT, false); } }); } From 5c73e5874d8cdf961bcdd9902e19a21d13e07827 Mon Sep 17 00:00:00 2001 From: jojo Date: Wed, 3 Feb 2021 19:41:00 +0100 Subject: [PATCH 2/2] Fix Sound of TNT ignite with freeze enabled --- .../src/de/steamwar/bausystem/commands/CommandFreeze.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java index 08097c3..9c2ddac 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java @@ -66,7 +66,7 @@ public class CommandFreeze extends RegionToggleCommand { }); } - @EventHandler(ignoreCancelled = true) + @EventHandler public void onBlockCanBuild(BlockCanBuildEvent e) { if (!e.isBuildable()) return; Region.getRegion(e.getBlock().getLocation(), region -> {