From bb382a969c367afe6ce0e4fc2c9f091971af001a Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Fri, 4 Dec 2015 08:02:38 -0500 Subject: [PATCH] Fix heavy attribute, disable claim visualizer --- .../src/mineplex/game/clans/clans/ClansManager.java | 2 +- .../game/clans/items/attributes/bow/HeavyArrowsAttribute.java | 3 ++- .../src/mineplex/game/clans/spawn/Spawn.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java index 8b09f8db2..d97ad7c78 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java @@ -305,7 +305,7 @@ public class ClansManager extends MiniClientPluginimplements IRelati loadClan(token); } - new ClaimVisualizer(plugin, this); +// new ClaimVisualizer(plugin, this); // RedisDataRepository(ConnectionData writeConn, ConnectionData // readConn, Region region, Class elementType, String elementLabel) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/HeavyArrowsAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/HeavyArrowsAttribute.java index 16aa30a21..f5e55d42c 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/HeavyArrowsAttribute.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/HeavyArrowsAttribute.java @@ -35,6 +35,7 @@ public class HeavyArrowsAttribute extends ItemAttribute @Override public void onAttack(CustomDamageEvent event) { - event.AddKnockback("HeavyAttribute", _knockbackPercent); + double knockback = (_knockbackPercent / 100d) * 6; + event.AddKnockback("Heavy Attribute", knockback); } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/Spawn.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/Spawn.java index dfca12bb5..50a251707 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/Spawn.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/Spawn.java @@ -248,7 +248,7 @@ public class Spawn extends MiniPlugin if (isInSpawn(player)) { - UtilPlayer.message(event.GetPlayer(), F.main("Safe Zone", "You cannot use " + F.skill(event.GetSkillName() + " in " + F.elem("Safe Zone") + "."))); + UtilPlayer.message(event.GetPlayer(), F.main("Safe Zone", "You cannot use " + F.skill(event.GetSkillName()) + " in " + F.elem("Safe Zone") + ".")); event.SetCancelled(true); } }