From 38473dcffd783dcddeaae865410d504445a8d360 Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 11 Sep 2016 03:47:52 +0100 Subject: [PATCH] Fix metal taking too little damage with full iron (#203) --- .../src/nautilus/game/arcade/kit/perks/PerkMagnetism.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkMagnetism.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkMagnetism.java index dee6a4981..d9bbaa5b9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkMagnetism.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkMagnetism.java @@ -6,6 +6,7 @@ import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.block.Action; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockPlaceEvent; @@ -50,7 +51,7 @@ public class PerkMagnetism extends Perk _magnituideFactor = magnitudeFactor; } - @EventHandler + @EventHandler(priority = EventPriority.HIGHEST) public void onCustomDamage(CustomDamageEvent event) { if (!(event.GetDamageeEntity() instanceof Player)) @@ -67,7 +68,7 @@ public class PerkMagnetism extends Perk int magnitude = getAmountOfMetalArmor(player); - event.AddMod(GetName(), event.GetDamage() * (magnitude * -0.075)); + event.AddMod(GetName(), event.GetDamage() * (magnitude * -0.05)); } @EventHandler