EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Fixed bug where splash potions could raise a player's unarmed level.

Browse Source 
Fixes #678
This commit is contained in:
GJ
2013-02-13 12:10:10 -05:00
parent 7110e6ec3d
commit 8312570825
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/gmail/nossr50/listeners/EntityListener.java
View File

@ -4,6 +4,7 @@ import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.AnimalTamer;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.FallingBlock;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;

9
src/main/java/com/gmail/nossr50/skills/utilities/CombatTools.java
View File

@ -70,8 +70,9 @@ public final class CombatTools {
ItemStack heldItem = player.getItemInHand();
Material heldItemType = heldItem.getType();
DamageCause damageCause = event.getCause();
if (ItemChecks.isSword(heldItem)) {
if (ItemChecks.isSword(heldItem) && damageCause != DamageCause.MAGIC) {
if (targetIsPlayer || targetIsTamedPet) {
if (!Swords.pvpEnabled) {
return;
@ -102,7 +103,7 @@ public final class CombatTools {
startGainXp(mcMMOPlayer, target, SkillType.SWORDS);
}
}
else if (ItemChecks.isAxe(heldItem)) {
else if (ItemChecks.isAxe(heldItem) && damageCause != DamageCause.MAGIC) {
if (targetIsPlayer || targetIsTamedPet) {
if (!Axes.pvpEnabled) {
return;
@ -140,7 +141,7 @@ public final class CombatTools {
startGainXp(mcMMOPlayer, target, SkillType.AXES);
}
}
else if (heldItemType == Material.AIR) {
else if (heldItemType == Material.AIR && damageCause != DamageCause.MAGIC) {
if (targetIsPlayer || targetIsTamedPet) {
if (!configInstance.getUnarmedPVP()) {
return;
@ -175,7 +176,7 @@ public final class CombatTools {
startGainXp(mcMMOPlayer, target, SkillType.UNARMED);
}
}
else if (heldItemType == Material.BONE && target instanceof Tameable && Permissions.beastLore(player)) {
else if (heldItemType == Material.BONE && target instanceof Tameable && Permissions.beastLore(player) && damageCause != DamageCause.MAGIC) {
TamingManager tamingManager = new TamingManager(Users.getPlayer(player));
tamingManager.beastLore(target);
event.setCancelled(true);