EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-25 06:36:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'configurable' of https://github.com/mcMMO-dev/mcmmo into configurable

Browse Source
This commit is contained in:
nossr50 2019-04-24 17:17:26 -07:00
commit 17c193f984
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java
View File

@ -77,7 +77,9 @@ public class Roll extends AcrobaticsSubSkill {
if (canRoll(player)) { if (canRoll(player)) {
entityDamageEvent.setDamage(rollCheck(player, mcMMOPlayer, entityDamageEvent.getDamage())); entityDamageEvent.setDamage(rollCheck(player, mcMMOPlayer, entityDamageEvent.getDamage()));
if (entityDamageEvent.getFinalDamage() == 0) { //Check getDamage() instead of getFinalDamage()
//Prevent unintended invincibility if Absorption covers all of the damage
if (entityDamageEvent.getDamage() == 0) {
entityDamageEvent.setCancelled(true); entityDamageEvent.setCancelled(true);
return true; return true;
} }

24
src/main/java/com/gmail/nossr50/util/EventUtils.java
View File

@ -43,6 +43,7 @@ import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.player.PlayerFishEvent; import org.bukkit.event.player.PlayerFishEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
import org.bukkit.potion.PotionEffectType;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -85,7 +86,7 @@ public class EventUtils {
* *
* 1) The player is real and not an NPC * 1) The player is real and not an NPC
* 2) The player is not in god mode * 2) The player is not in god mode
* 3) The damage dealt is above 0 * 3) The damage dealt is above 0 (if a player has Absorption, check if damage and final damage are above 0)
* 4) The player is loaded into our mcMMO user profiles * 4) The player is loaded into our mcMMO user profiles
* *
* @param entityDamageEvent * @param entityDamageEvent
@ -94,12 +95,27 @@ public class EventUtils {
public static boolean isRealPlayerDamaged(EntityDamageEvent entityDamageEvent) public static boolean isRealPlayerDamaged(EntityDamageEvent entityDamageEvent)
{ {
//Make sure the damage is above 0 //Make sure the damage is above 0
double damage = entityDamageEvent.getFinalDamage(); double damage = entityDamageEvent.getDamage();
double finalDamage = entityDamageEvent.getFinalDamage();
if (damage <= 0) { if (entityDamageEvent.getEntity() instanceof Player) {
return false; Player player = (Player) entityDamageEvent.getEntity();
//If a player has Absorption, check both damage and final damage
if (player.hasPotionEffect(PotionEffectType.ABSORPTION)) {
if (damage <= 0 && finalDamage <= 0) {
return false;
}
}
//Otherwise, do original check - only check final damage
else {
if (finalDamage <= 0) {
return false;
}
}
} }
Entity entity = entityDamageEvent.getEntity(); Entity entity = entityDamageEvent.getEntity();
//Check to make sure the entity is not an NPC //Check to make sure the entity is not an NPC