Fork/mmocore
2
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

Fixed Spell Damage issue when running alongside MMOItems

Browse Source
This commit is contained in:
Aria 2019-09-19 01:05:47 +02:00
parent 30c3d08273
commit 65e3abbda1
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java
View File

@ -1,6 +1,7 @@
package net.Indyuce.mmocore.listener; package net.Indyuce.mmocore.listener;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile; import org.bukkit.entity.Projectile;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -14,6 +15,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
import com.codingforcookies.armorequip.ArmorEquipEvent; import com.codingforcookies.armorequip.ArmorEquipEvent;
import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.event.PlayerAttackEvent; import net.Indyuce.mmocore.api.event.PlayerAttackEvent;
import net.Indyuce.mmocore.api.event.PlayerCombatEvent; import net.Indyuce.mmocore.api.event.PlayerCombatEvent;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
@ -99,10 +101,17 @@ public class PlayerListener implements Listener {
public void h(PlayerAttackEvent event) { public void h(PlayerAttackEvent event) {
double d = 1; double d = 1;
if(Bukkit.getPluginManager().isPluginEnabled("MMOItems") &&
event.getDamageInfo().getTypes().contains(DamageType.SKILL)) {
event.setDamage(event.getDamage());
return;
}
PlayerStats stats = event.getData().getStats(); PlayerStats stats = event.getData().getStats();
for (DamageType type : event.getDamageInfo().getTypes()) for (DamageType type : event.getDamageInfo().getTypes())
d += stats.getStat(type.getStat()) / 100; d += stats.getStat(type.getStat()) / 100;
MMOCore.log("Damage: " + event.getDamage() * d);
event.setDamage(event.getDamage() * d); event.setDamage(event.getDamage() * d);
} }
} }