EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 05:06:45 +01:00
Code Issues Projects Releases Wiki Activity

Fixed ClassCastException relating to counter-attack with Swords. Fixes

Browse Source 
#784
This commit is contained in:
GJ 2013-03-04 21:59:16 -05:00
parent 3440833af8
commit 4210920c5f
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -13,6 +13,7 @@ Version 1.4.02-dev
= Fixed bug where some skills weren't registering as unlocked until one level later = Fixed bug where some skills weren't registering as unlocked until one level later
= Fixed bug where the PTP cooldown was being read improperly = Fixed bug where the PTP cooldown was being read improperly
= Fixed bug where /ptp <accept|toggle|acceptall> where broken = Fixed bug where /ptp <accept|toggle|acceptall> where broken
= Fixed ClassCastException relating to counter-attack with Swords
Version 1.4.01 Version 1.4.01
= Fixed bug where trying to use /mctop or /xplock with the Smelting child skill caused NPEs = Fixed bug where trying to use /mctop or /xplock with the Smelting child skill caused NPEs

5
src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java
View File

@ -1,5 +1,6 @@
package com.gmail.nossr50.skills.swords; package com.gmail.nossr50.skills.swords;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -28,8 +29,8 @@ public class SwordsManager extends SkillManager {
return Permissions.bleed(getPlayer()); return Permissions.bleed(getPlayer());
} }
public boolean canUseCounterAttack() { public boolean canUseCounterAttack(Entity target) {
return Permissions.counterAttack(getPlayer()); return target instanceof LivingEntity && Permissions.counterAttack(getPlayer());
} }
public boolean canUseSerratedStrike() { public boolean canUseSerratedStrike() {

2
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@ -279,7 +279,7 @@ public final class CombatUtils {
SwordsManager swordsManager = mcMMOPlayer.getSwordsManager(); SwordsManager swordsManager = mcMMOPlayer.getSwordsManager();
if (swordsManager.canUseCounterAttack()) { if (swordsManager.canUseCounterAttack(damager)) {
swordsManager.counterAttackChecks((LivingEntity) damager, event.getDamage()); swordsManager.counterAttackChecks((LivingEntity) damager, event.getDamage());
} }
} }