From aefb3fedcac289afc0c4ab61abbccfa04dc1346c Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Sun, 21 Aug 2016 17:07:39 -0500 Subject: [PATCH] Add CalculateDamage() to API. --- TwosideKeeper.jar | Bin 504405 -> 504437 bytes .../TwosideKeeper/TwosideKeeperAPI.java | 14 ++++++++++++++ 2 files changed, 14 insertions(+) diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index 4727ec5e763961f788d12a3f48835d243636333e..6efbf0d681c09646caecb29b7a1e2ec9b866970b 100644 GIT binary patch delta 3499 zcmV;c4OH^gKDFW<>fj5OW0fjdLg*O9*Hw1+@1%)>T zwKoT_Q4Z{g6-oZHzB$bd008AGmmz)yEPp{zNiJh-VRLiESqpevMHN1iCc8;``=seB zZD~nq^Ju#*E%cF+l2_Y>qz!CHp*-|vcaq-b=HBJ*-J}5&1O)^X1VuzeQBgq

}@{ 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 diff --git a/src/sig/plugin/TwosideKeeper/TwosideKeeperAPI.java b/src/sig/plugin/TwosideKeeper/TwosideKeeperAPI.java index 871b8f7..38b6994 100644 --- a/src/sig/plugin/TwosideKeeper/TwosideKeeperAPI.java +++ b/src/sig/plugin/TwosideKeeper/TwosideKeeperAPI.java @@ -181,6 +181,20 @@ public final class TwosideKeeperAPI { return CustomDamage.ApplyDamage(damage, damager, target, weapon, reason, flags); } + /** + * Returns how much damage would be dealt with this particular calculation of damage dealt. Uses same exact arguments as applyDamage. + * @param damage + * @param damager + * @param target + * @param weapon + * @param reason + * @param flags + * @return + */ + public static double CalculateDamage(double damage, Entity damager, LivingEntity target, ItemStack weapon, String reason, int flags) { + return CustomDamage.CalculateDamage(damage, damager, target, weapon, reason, flags); + } + /** * Returns the string of the last damage reason the player took. All attacks in the game except * for basic attacks from monsters and projectiles (which makes this return null) have a reason.