Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2025-03-13 13:30:06 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

moved isUndead method

Browse Source
This commit is contained in:
Indyuce 2019-08-31 20:43:23 +02:00
parent 6c85ac49bb
commit d8c999fc33
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/Indyuce/mmoitems/MMOUtils.java
View File

@ -15,6 +15,9 @@ import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Skeleton;
import org.bukkit.entity.Wither;
import org.bukkit.entity.Zombie;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.potion.PotionEffectType;
@ -61,6 +64,10 @@ public class MMOUtils {
return bar.substring(0, (int) (ratio * n)) + ChatColor.WHITE + bar.substring((int) (ratio * n));
}
public static boolean isUndead(Entity entity) {
return entity instanceof Zombie || entity instanceof Skeleton || entity instanceof Wither;
}
public static void giveOrDrop(Player player, ItemStack item) {
for (ItemStack drop : player.getInventory().addItem(item).values())
player.getWorld().dropItem(player.getLocation(), drop);

5
src/main/java/net/Indyuce/mmoitems/api/AttackResult.java
View File

@ -12,6 +12,7 @@ import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.MMOUtils;
import net.Indyuce.mmoitems.api.Ability.CastingMode;
import net.Indyuce.mmoitems.api.item.NBTItem;
import net.Indyuce.mmoitems.api.player.PlayerStats.TemporaryStats;
@ -122,7 +123,7 @@ public class AttackResult {
addRelativeDamage(stats.getStat(type.getStat()) / 100);
addRelativeDamage(stats.getStat(target instanceof Player ? ItemStat.PVP_DAMAGE : ItemStat.PVE_DAMAGE) / 100);
if (MMOItems.plugin.getDamage().isUndead(target))
if (MMOUtils.isUndead(target))
addRelativeDamage(stats.getStat(ItemStat.UNDEAD_DAMAGE) / 100);
return this;
@ -148,7 +149,7 @@ public class AttackResult {
addRelativeDamage(stats.getStat(type.getStat()) / 100);
addRelativeDamage(stats.getStat(target instanceof Player ? ItemStat.PVP_DAMAGE : ItemStat.PVE_DAMAGE) / 100);
if (MMOItems.plugin.getDamage().isUndead(target))
if (MMOUtils.isUndead(target))
addRelativeDamage(stats.getStat(ItemStat.UNDEAD_DAMAGE) / 100);
// critical strikes