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

final damage values of 0 are only ignored in certain circumstances, fixes a few bugs

Browse Source
This commit is contained in:
nossr50
2020-10-05 14:13:32 -07:00
parent 5d022b6f7c
commit a6586e07cc
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -411,7 +411,6 @@ 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
@ -421,7 +420,7 @@ public class EntityListener implements Listener {
* Surprising this kind of thing
*
*/
if(damage <= 0) {
if(event.getDamage() <= 0 && !CombatUtils.isDamageLikelyFromNormalCombat(event.getCause())) {
return;
}

12
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@ -42,6 +42,18 @@ import java.util.Map;
public final class CombatUtils {
private CombatUtils() {}
//Likely.. because who knows what plugins are throwing around
public static boolean isDamageLikelyFromNormalCombat(DamageCause damageCause) {
switch (damageCause) {
case ENTITY_ATTACK:
case ENTITY_SWEEP_ATTACK:
case PROJECTILE:
return true;
default:
return false;
}
}
private static void processSwordCombat(LivingEntity target, Player player, EntityDamageByEntityEvent event) {
if (event.getCause() == DamageCause.THORNS) {
return;