From a59907fcece62fc2506e7ca2e0ff7c94be06b2b3 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Wed, 16 Jan 2019 11:07:11 -0800 Subject: [PATCH] Shake sends custom damagecause --- Changelog.txt | 1 + .../java/com/gmail/nossr50/skills/fishing/FishingManager.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Changelog.txt b/Changelog.txt index 310e09eaa..ffd5ebc19 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -78,6 +78,7 @@ Version 2.1.0 ! (Skills) Axe's Impact now uses a rank system ! (Skills) Herbalism's Farmer's Diet now uses a rank system ! (Skills) Herbalism's Green Thumb now uses a rank system + = (Skills) Shake now sends custom damage types for better nocheat compat ! (Config) Unarmed.IronArm in advanced.yml is now Unarmed.IronArmStyle ! (Config) Unarmed.Deflect in advanced.yml is now Unarmed.ArrowDeflect ! (Config) Swords.Counter in advanced.yml is now Swords.CounterAttack diff --git a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java index b993f5031..b850c9404 100644 --- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java @@ -31,6 +31,7 @@ import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.*; +import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; @@ -439,7 +440,7 @@ public class FishingManager extends SkillManager { } Misc.dropItem(target.getLocation(), drop); - CombatUtils.dealDamage(target, Math.max(target.getMaxHealth() / 4, 1), getPlayer()); // Make it so you can shake a mob no more than 4 times. + CombatUtils.dealDamage(target, Math.max(target.getMaxHealth() / 4, 1), EntityDamageEvent.DamageCause.CUSTOM, getPlayer()); // Make it so you can shake a mob no more than 4 times. applyXpGain(ExperienceConfig.getInstance().getFishingShakeXP(), XPGainReason.PVE); } }