From 0c6cfba029f61b55340c7760834a0a4fe8160c42 Mon Sep 17 00:00:00 2001 From: zOnlyKroks Date: Sun, 19 Dec 2021 14:45:19 +0100 Subject: [PATCH 1/5] Anti Ice and Snow Melt --- .../de/steamwar/fightsystem/FightSystem.java | 1 + .../listener/BlockFadeListener.java | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java b/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java index 1ef5115..02473ff 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java @@ -84,6 +84,7 @@ public class FightSystem extends JavaPlugin { new PersonalKitCreator(); new ArrowStopper(); new ArrowPickup(); + new BlockFadeListener(); new EnterHandler(); new TechHider(); diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java b/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java new file mode 100644 index 0000000..704ec6b --- /dev/null +++ b/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java @@ -0,0 +1,24 @@ +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 BlockFadeListener implements Listener { + + public BlockFadeListener() { + new StateDependentListener(ArenaMode.Check, FightState.All, this); + } + + @EventHandler + public void onBlockFade(BlockFadeEvent event) { + if (event.getBlock().getType() == Material.SNOW_BLOCK || event.getBlock().getType() == Material.SNOW || event.getBlock().getType() == Material.ICE) { + event.setCancelled(true); + } + } + +} -- 2.39.2 From 9beb9f5aad2d7f4ca0af37637b3fc338805e7251 Mon Sep 17 00:00:00 2001 From: zOnlyKroks Date: Sun, 19 Dec 2021 14:47:17 +0100 Subject: [PATCH 2/5] Little Typo --- .../src/de/steamwar/fightsystem/listener/BlockFadeListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java b/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java index 704ec6b..5a80166 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java @@ -11,7 +11,7 @@ import org.bukkit.event.block.BlockFadeEvent; public class BlockFadeListener implements Listener { public BlockFadeListener() { - new StateDependentListener(ArenaMode.Check, FightState.All, this); + new StateDependentListener(ArenaMode.All, FightState.All, this); } @EventHandler -- 2.39.2 From 96f1da0aefb5cc2c5ab952f65edfc5a3fbad8b7e Mon Sep 17 00:00:00 2001 From: zOnlyKroks Date: Wed, 22 Dec 2021 19:21:17 +0100 Subject: [PATCH 3/5] Config Options --- FightSystem_Core/src/config.yml | 3 ++- FightSystem_Core/src/de/steamwar/fightsystem/Config.java | 2 ++ .../de/steamwar/fightsystem/listener/BlockFadeListener.java | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/FightSystem_Core/src/config.yml b/FightSystem_Core/src/config.yml index 119f225..d64ac04 100644 --- a/FightSystem_Core/src/config.yml +++ b/FightSystem_Core/src/config.yml @@ -41,7 +41,8 @@ Arena: BorderFromSchematic: 12 # defaults to 12 if missing # If ground walkable, teams can walk below the lower arena border during setup GroundWalkable: true # defaults to true if missing - + # Disable snow melt + SnowMelt: false Schematic: # The size of the schematics Size: diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/Config.java b/FightSystem_Core/src/de/steamwar/fightsystem/Config.java index 7e04187..8e00233 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/Config.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/Config.java @@ -69,6 +69,7 @@ public class Config { public static final int PreperationArea; public static final int WaterDepth; public static final boolean GroundWalkable; + public static final boolean SnowMelt; //schematic parameter public static final boolean RanksEnabled; @@ -164,6 +165,7 @@ public class Config { int schem2BorderZ = config.getInt("Arena.Schem2Border.z", 24); PreperationArea = config.getInt("Arena.BorderFromSchematic", 12); GroundWalkable = config.getBoolean("Arena.GroundWalkable", true); + SnowMelt = config.getBoolean("Arena.SnowMelt", false); int schemsizeX = config.getInt("Schematic.Size.x"); int schemsizeY = config.getInt("Schematic.Size.y"); diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java b/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java index 5a80166..ab16f99 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java @@ -1,6 +1,7 @@ package de.steamwar.fightsystem.listener; import de.steamwar.fightsystem.ArenaMode; +import de.steamwar.fightsystem.Config; import de.steamwar.fightsystem.states.FightState; import de.steamwar.fightsystem.states.StateDependentListener; import org.bukkit.Material; @@ -16,6 +17,7 @@ public class BlockFadeListener implements Listener { @EventHandler public void onBlockFade(BlockFadeEvent event) { + if(!Config.SnowMelt) return; if (event.getBlock().getType() == Material.SNOW_BLOCK || event.getBlock().getType() == Material.SNOW || event.getBlock().getType() == Material.ICE) { event.setCancelled(true); } -- 2.39.2 From e060e2e7a6d779f75cfffe6a879edfc4f338c38a Mon Sep 17 00:00:00 2001 From: zOnlyKroks Date: Wed, 22 Dec 2021 19:22:13 +0100 Subject: [PATCH 4/5] Better naming --- FightSystem_Core/src/config.yml | 2 +- FightSystem_Core/src/de/steamwar/fightsystem/Config.java | 4 ++-- .../de/steamwar/fightsystem/listener/BlockFadeListener.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/FightSystem_Core/src/config.yml b/FightSystem_Core/src/config.yml index d64ac04..26bc9b3 100644 --- a/FightSystem_Core/src/config.yml +++ b/FightSystem_Core/src/config.yml @@ -42,7 +42,7 @@ Arena: # If ground walkable, teams can walk below the lower arena border during setup GroundWalkable: true # defaults to true if missing # Disable snow melt - SnowMelt: false + DisableSnowMelt: false Schematic: # The size of the schematics Size: diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/Config.java b/FightSystem_Core/src/de/steamwar/fightsystem/Config.java index 8e00233..1292a70 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/Config.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/Config.java @@ -69,7 +69,7 @@ public class Config { public static final int PreperationArea; public static final int WaterDepth; public static final boolean GroundWalkable; - public static final boolean SnowMelt; + public static final boolean DisableSnowMelt; //schematic parameter public static final boolean RanksEnabled; @@ -165,7 +165,7 @@ public class Config { int schem2BorderZ = config.getInt("Arena.Schem2Border.z", 24); PreperationArea = config.getInt("Arena.BorderFromSchematic", 12); GroundWalkable = config.getBoolean("Arena.GroundWalkable", true); - SnowMelt = config.getBoolean("Arena.SnowMelt", false); + DisableSnowMelt = config.getBoolean("Arena.DisableSnowMelt", false); int schemsizeX = config.getInt("Schematic.Size.x"); int schemsizeY = config.getInt("Schematic.Size.y"); diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java b/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java index ab16f99..a2ce7f5 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java @@ -17,7 +17,7 @@ public class BlockFadeListener implements Listener { @EventHandler public void onBlockFade(BlockFadeEvent event) { - if(!Config.SnowMelt) return; + if(!Config.DisableSnowMelt) return; if (event.getBlock().getType() == Material.SNOW_BLOCK || event.getBlock().getType() == Material.SNOW || event.getBlock().getType() == Material.ICE) { event.setCancelled(true); } -- 2.39.2 From 2baacdb00f2885ef0b1360df4155c102fb683016 Mon Sep 17 00:00:00 2001 From: zOnlyKroks Date: Thu, 23 Dec 2021 16:58:50 +0100 Subject: [PATCH 5/5] Performance --- .../de/steamwar/fightsystem/listener/BlockFadeListener.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java b/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java index a2ce7f5..5edd1c2 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java @@ -12,12 +12,11 @@ import org.bukkit.event.block.BlockFadeEvent; public class BlockFadeListener implements Listener { public BlockFadeListener() { - new StateDependentListener(ArenaMode.All, FightState.All, this); + new StateDependentListener(Config.DisableSnowMelt, FightState.All, this); } @EventHandler public void onBlockFade(BlockFadeEvent event) { - if(!Config.DisableSnowMelt) return; if (event.getBlock().getType() == Material.SNOW_BLOCK || event.getBlock().getType() == Material.SNOW || event.getBlock().getType() == Material.ICE) { event.setCancelled(true); } -- 2.39.2