Browse Source

Shake sends custom damagecause

nossr50 6 years ago
parent
commit
a59907fcec

+ 1 - 0
Changelog.txt

@@ -78,6 +78,7 @@ Version 2.1.0
  ! (Skills) Axe's Impact now uses a rank system
  ! (Skills) Axe's Impact now uses a rank system
  ! (Skills) Herbalism's Farmer's Diet 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) 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.IronArm in advanced.yml is now Unarmed.IronArmStyle
  ! (Config) Unarmed.Deflect in advanced.yml is now Unarmed.ArrowDeflect
  ! (Config) Unarmed.Deflect in advanced.yml is now Unarmed.ArrowDeflect
  ! (Config) Swords.Counter in advanced.yml is now Swords.CounterAttack
  ! (Config) Swords.Counter in advanced.yml is now Swords.CounterAttack

+ 2 - 1
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.block.BlockFace;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.*;
 import org.bukkit.entity.*;
+import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.PlayerInventory;
@@ -439,7 +440,7 @@ public class FishingManager extends SkillManager {
             }
             }
 
 
             Misc.dropItem(target.getLocation(), drop);
             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);
             applyXpGain(ExperienceConfig.getInstance().getFishingShakeXP(), XPGainReason.PVE);
         }
         }
     }
     }