From ce32792668cc2517f4f55c8367e865fdfcc35331 Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Sat, 9 Mar 2013 14:44:29 +0100 Subject: [PATCH] Fixed bug where Deflect was calculated based on the attacker, not the defender Closes #794 --- Changelog.txt | 1 + src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.txt b/Changelog.txt index 2f50f575d..b83041cec 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -25,6 +25,7 @@ Version 1.4.03-dev = Fixed bug with using Salvage on stacked items. = Fixed bug where the 'mcmmo.commands.ptp.world.all' was registered twice = Fixed bug where Beast Lore wouldn't work on friendly pets + = Fixed bug where Deflect was calculated based on the attacker, not the defender. (We really did this time!) ! Moved the Salvage unlock level from config.yml to advanced.yml ! Changed how Chimaera Wings are acquired, you need to craft them now. (By default, use 5 feathers in a shapeless recipe) - Removed option to disable Salvage via the config file. This should be handled via permissions instead. diff --git a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java index dd17f5b19..8e44e9774 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java @@ -232,7 +232,7 @@ public final class CombatUtils { UnarmedManager unarmedManager = UserManager.getPlayer((Player) target).getUnarmedManager(); if (unarmedManager.canDeflect()) { - event.setCancelled(mcMMOPlayer.getUnarmedManager().deflectCheck()); + event.setCancelled(unarmedManager.deflectCheck()); if (event.isCancelled()) { return;