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

NPC safechecks

Browse Source
This commit is contained in:
Aria 2019-09-18 16:40:35 +02:00
parent 6452b84dbd
commit 30c3d08273
2 changed files with 2 additions and 1 deletions
src/main/java/net/Indyuce/mmocore/listener
PlayerListener.java
event
PlayerAttackEventListener.java

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

@ -56,6 +56,7 @@ public class PlayerListener implements Listener {
*/ */
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void d(EntityDamageByEntityEvent event) { public void d(EntityDamageByEntityEvent event) {
if(event.getEntity().hasMetadata("NPC")) return;
if (event.getEntity() instanceof Player) if (event.getEntity() instanceof Player)
PlayerData.get((Player) event.getEntity()).updateCombat(); PlayerData.get((Player) event.getEntity()).updateCombat();

2
src/main/java/net/Indyuce/mmocore/listener/event/PlayerAttackEventListener.java
View File

@ -47,7 +47,7 @@ public class PlayerAttackEventListener implements Listener {
* check damage systems from other MMOCore plugins + from MMOCore, and * check damage systems from other MMOCore plugins + from MMOCore, and
* register an attack damage for easier plugin calculations * register an attack damage for easier plugin calculations
*/ */
if (damager instanceof Player) if (damager instanceof Player && !damager.hasMetadata("NPC"))
Bukkit.getPluginManager().callEvent(new PlayerAttackEvent(PlayerData.get((Player) damager), event, MMOCore.plugin.damage.findInfo(event.getEntity()).merge(info))); Bukkit.getPluginManager().callEvent(new PlayerAttackEvent(PlayerData.get((Player) damager), event, MMOCore.plugin.damage.findInfo(event.getEntity()).merge(info)));
/* /*