From 7c53feec71ae2a2a8fd0836518cadd22c35280ea Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Sun, 30 Aug 2015 17:59:46 -0700 Subject: [PATCH] Add axes and bows to murder detection --- .../src/mineplex/game/clans/clans/murder/MurderManager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/murder/MurderManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/murder/MurderManager.java index 6f965128d..300f52848 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/murder/MurderManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/murder/MurderManager.java @@ -27,7 +27,8 @@ import mineplex.minecraft.game.core.combat.event.CombatDeathEvent; public class MurderManager extends MiniClientPlugin { - private final Material[] weapons = { Material.WOOD_SWORD, Material.STONE_SWORD, Material.IRON_SWORD, Material.DIAMOND_SWORD }; + private final Material[] weapons = { Material.WOOD_SWORD, Material.STONE_SWORD, Material.IRON_SWORD, Material.DIAMOND_SWORD, + Material.WOOD_AXE, Material.STONE_AXE, Material.IRON_AXE, Material.DIAMOND_AXE, Material.BOW }; private final Material[] armour = { Material.LEATHER_HELMET, Material.LEATHER_CHESTPLATE, Material.LEATHER_LEGGINGS, Material.LEATHER_BOOTS, Material.IRON_HELMET, Material.IRON_CHESTPLATE, Material.IRON_LEGGINGS, Material.IRON_BOOTS, Material.GOLD_HELMET, Material.GOLD_CHESTPLATE, Material.GOLD_LEGGINGS, Material.GOLD_BOOTS, @@ -58,6 +59,8 @@ public class MurderManager extends MiniClientPlugin Player killer = UtilPlayer.searchExact(combatKiller.GetName()); if (killer != null) { + refreshWeaklingStatus(deadPlayer); + refreshWeaklingStatus(killer); if (canMurderOccur(killer, deadPlayer, location) && isWeakling(deadPlayer) && !isWeakling(killer)) { // Was a murder