From 9ab4d59cca3407c0758f82372b2aa902c4cfc22b Mon Sep 17 00:00:00 2001 From: nossr50 Date: Sat, 22 Jun 2019 22:35:25 -0700 Subject: [PATCH] mcMMO will ignore damage triggers for events with a value of zero --- Changelog.txt | 4 ++++ pom.xml | 2 +- .../com/gmail/nossr50/listeners/EntityListener.java | 13 +++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Changelog.txt b/Changelog.txt index b751999c4..509656459 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,3 +1,7 @@ +Version 2.1.88 + mcMMO is now more compatible with a plugin named Project Korra + mcMMO will no longer process combat triggers for damage at or below 0 + Version 2.1.87 (Level caps are not on by default in mcMMO, this is something you can turn on) diff --git a/pom.xml b/pom.xml index 2ee48ab08..5725ee2c9 100755 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.gmail.nossr50.mcMMO mcMMO - 2.1.87 + 2.1.88 mcMMO https://github.com/mcMMO-Dev/mcMMO diff --git a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java index c16356e70..276dcd7d8 100644 --- a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java @@ -416,6 +416,19 @@ public class EntityListener implements Listener { } } + /* + * This was put here to solve a plugin conflict with a mod called Project Korra + * Project Korra sends out a damage event with exactly 0 damage + * mcMMO does some calculations for the damage in an event and it ends up dividing by zero, + * as a result of the modifiers for the event being 0 and the damage set for this event being 0. + * + * Surprising this kind of thing + * + */ + if(damage <= 0) { + return; + } + CombatUtils.processCombatAttack(event, attacker, target); CombatUtils.handleHealthbars(attacker, target, event.getFinalDamage(), plugin);