From 5c5abd91135ba32192e39062dc44d4dd67b8f4a2 Mon Sep 17 00:00:00 2001 From: zOnlyKroks Date: Thu, 8 Jul 2021 11:14:13 +0200 Subject: [PATCH 1/3] Anti_Ice_Melt --- .../de/steamwar/fightsystem/FightSystem.java | 1 + .../fightsystem/listener/BlockFade.java | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 FightSystem_Main/src/de/steamwar/fightsystem/listener/BlockFade.java diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java b/FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java index 481ba37..88e2d29 100644 --- a/FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java +++ b/FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java @@ -92,6 +92,7 @@ public class FightSystem extends JavaPlugin { new EnterHandler(); new TechHider(); new FightWorld(); + new BlockFade(); new WinconditionAllDead(); new WinconditionCaptainDead(); diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/BlockFade.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/BlockFade.java new file mode 100644 index 0000000..6ccc4c3 --- /dev/null +++ b/FightSystem_Main/src/de/steamwar/fightsystem/listener/BlockFade.java @@ -0,0 +1,23 @@ +package de.steamwar.fightsystem.listener; + +import de.steamwar.fightsystem.ArenaMode; +import de.steamwar.fightsystem.states.FightState; +import de.steamwar.fightsystem.states.StateDependentListener; +import org.bukkit.Material; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.block.BlockFadeEvent; + +public class BlockFade implements Listener { + + public BlockFade() { + new StateDependentListener(ArenaMode.All, FightState.All, this); + } + + @EventHandler + public void blockFade(BlockFadeEvent event) { + if(event.getBlock().getType() == Material.ICE) { + event.setCancelled(true); + } + } +} -- 2.39.2 From f4160176edb5dc08edc89fe3792773b51ada8b8c Mon Sep 17 00:00:00 2001 From: zOnlyKroks Date: Fri, 9 Jul 2021 15:17:52 +0200 Subject: [PATCH 2/3] Anti_Ice_Melt --- .../src/de/steamwar/fightsystem/listener/BlockFade.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/BlockFade.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/BlockFade.java index 6ccc4c3..cea0a6c 100644 --- a/FightSystem_Main/src/de/steamwar/fightsystem/listener/BlockFade.java +++ b/FightSystem_Main/src/de/steamwar/fightsystem/listener/BlockFade.java @@ -16,8 +16,6 @@ public class BlockFade implements Listener { @EventHandler public void blockFade(BlockFadeEvent event) { - if(event.getBlock().getType() == Material.ICE) { - event.setCancelled(true); - } + event.setCancelled(true); } } -- 2.39.2 From d41d18cf8b0abf5ced036d3f83995ef3bdfbce27 Mon Sep 17 00:00:00 2001 From: zOnlyKroks Date: Fri, 9 Jul 2021 15:25:27 +0200 Subject: [PATCH 3/3] Fire is now Disappearing --- .../src/de/steamwar/fightsystem/listener/BlockFade.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/BlockFade.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/BlockFade.java index cea0a6c..fbf1335 100644 --- a/FightSystem_Main/src/de/steamwar/fightsystem/listener/BlockFade.java +++ b/FightSystem_Main/src/de/steamwar/fightsystem/listener/BlockFade.java @@ -3,6 +3,7 @@ package de.steamwar.fightsystem.listener; import de.steamwar.fightsystem.ArenaMode; import de.steamwar.fightsystem.states.FightState; import de.steamwar.fightsystem.states.StateDependentListener; +import net.minecraft.server.v1_15_R1.Blocks; import org.bukkit.Material; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -16,6 +17,8 @@ public class BlockFade implements Listener { @EventHandler public void blockFade(BlockFadeEvent event) { - event.setCancelled(true); + if(!event.getBlock().getType().equals(Material.FIRE)) { + event.setCancelled(true); + } } } -- 2.39.2