From c969775df3b8e7199585304928c408c284f9ae9e Mon Sep 17 00:00:00 2001 From: Chiss Date: Sat, 21 Dec 2013 19:00:30 +1100 Subject: [PATCH] Hub gadgets for xmas --- .../src/mineplex/core/common/util/UtilBlock.java | 1 + .../mineplex/core/blockrestore/BlockRestore.java | 7 ++++--- .../src/mineplex/hub/gadget/GadgetManager.java | 2 +- .../gadget/gadgets/Christmas2013_SnowCannon.java | 2 +- .../src/mineplex/hub/mount/types/Frost.java | 14 ++++++-------- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java index 0d1157d40..8de9356d1 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java @@ -80,6 +80,7 @@ public class UtilBlock blockPassSet.add((byte)118); blockPassSet.add((byte)119); blockPassSet.add((byte)120); + blockPassSet.add((byte)171); } return !blockPassSet.contains(block); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestore.java b/Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestore.java index fe590a71e..68db3569f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestore.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestore.java @@ -129,12 +129,13 @@ public class BlockRestore extends MiniPlugin if (block.getRelative(BlockFace.DOWN).getType().toString().contains("STAIRS")) return; - //No Snow on Fence - if (block.getRelative(BlockFace.DOWN).getTypeId() == 85) + //No Snow on Fence or Walls + if (block.getRelative(BlockFace.DOWN).getTypeId() == 85 || + block.getRelative(BlockFace.DOWN).getTypeId() == 139) return; //Not Buildable - if (!UtilBlock.airFoliage(block) && block.getTypeId() != 78) + if (!UtilBlock.airFoliage(block) && block.getTypeId() != 78 && block.getType() != Material.CARPET) return; //Limit Build Height diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/GadgetManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/GadgetManager.java index c1499aada..737a0d9bf 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/GadgetManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/GadgetManager.java @@ -66,7 +66,7 @@ public class GadgetManager extends MiniPlugin //Christmas 2013 _gadgets.add(new Christmas2013_Helmet(this)); - _gadgets.add(new Christmas2013_SnowCannon(this)); + //_gadgets.add(new Christmas2013_SnowCannon(this)); } @EventHandler diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Christmas2013_SnowCannon.java b/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Christmas2013_SnowCannon.java index c83f5720a..b80d45f94 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Christmas2013_SnowCannon.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Christmas2013_SnowCannon.java @@ -45,7 +45,7 @@ public class Christmas2013_SnowCannon extends ItemGadget C.cWhite + "at people you don't like!", }, -1, - Material.IRON_BARDING, (byte)0); + Material.DIAMOND_BARDING, (byte)0); } @Override diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/mount/types/Frost.java b/Plugins/Mineplex.Hub/src/mineplex/hub/mount/types/Frost.java index 7c248a87a..5c9947266 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/mount/types/Frost.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/mount/types/Frost.java @@ -31,10 +31,10 @@ public class Frost extends Mount C.cWhite + "it leaves a trail of frost", C.cWhite + "as it moves!", }, - Material.BONE, + Material.SNOW_BALL, (byte)0, -1, - Color.WHITE, Style.WHITE, Variant.HORSE, 0.8, null); + Color.WHITE, Style.WHITE, Variant.HORSE, 1, null); } @@ -48,7 +48,7 @@ public class Frost extends Mount { try { - UtilParticle.PlayParticle(player, ParticleType.SNOW_SHOVEL, horse.getLocation().add(0, 1, 0), 0.25f, 0.25f, 0.25f, 0, 3); + UtilParticle.PlayParticle(player, ParticleType.SNOW_SHOVEL, horse.getLocation().add(0, 1, 0), 0.25f, 0.25f, 0.25f, 0.1f, 4); } catch (Exception e) { @@ -64,15 +64,13 @@ public class Frost extends Mount if (event.getType() != UpdateType.TICK) return; - for (Player player : GetActive().keySet()) + for (Horse horse : GetActive().values()) { - double range = 5*player.getExp(); - //Blocks double duration = 2000; - HashMap blocks = UtilBlock.getInRadius(player.getLocation(), range); + HashMap blocks = UtilBlock.getInRadius(horse.getLocation(), 2.5d); for (Block block : blocks.keySet()) - { + { //Snow Manager.Manager.GetBlockRestore().Snow(block, (byte)1, (byte)1, (long)(duration * (1 + blocks.get(block))), 250, 0); }