From 6d7001fac245a60761aa937dee6c9fe3c9f60bbf Mon Sep 17 00:00:00 2001
From: Aria Sangarin <ariahyrule@gmail.com>
Date: Wed, 26 Feb 2020 12:54:36 +0100
Subject: [PATCH 1/3] Fixed running MMOCore without MMOItems

(NoClassDefFoundError: net.Indyuce.mmoitems.MMOItems)
---
 src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java | 3 +--
 src/main/resources/config.yml                                | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java b/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
index a6f305f8..8cb1553f 100644
--- a/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
+++ b/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
@@ -50,7 +50,6 @@ import net.Indyuce.mmocore.api.skill.SkillResult;
 import net.Indyuce.mmocore.api.skill.SkillResult.CancelReason;
 import net.Indyuce.mmocore.api.util.math.particle.SmallParticleEffect;
 import net.Indyuce.mmocore.listener.SpellCast.SkillCasting;
-import net.Indyuce.mmoitems.MMOItems;
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.mmogroup.mmolib.MMOLib;
@@ -496,7 +495,7 @@ public class PlayerData extends OfflinePlayerData {
 		}
 
 		// display hologram
-		if (MMOItems.plugin.getConfig().getBoolean("game-indicators.exp.enabled")) {
+		if (MMOCore.plugin.getConfig().getBoolean("display-exp-holograms")) {
 			if (loc != null && MMOCore.plugin.hologramSupport != null)
 				MMOCore.plugin.hologramSupport.displayIndicator(loc.add(.5, 1.5, .5), MMOCore.plugin.configManager.getSimpleMessage("exp-hologram", "exp", "" + value).message(), getPlayer());
 		}
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 17ecf8e5..705986c6 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -76,9 +76,7 @@ health-scale:
 disable-vanilla-regen: false
 
 # Allows to toggle exp hologram from gaining experiences
-game-indicators:
-    exp:
-        enabled: false
+display-exp-holograms: true
 
 # Players can swap their hotbar with the 9 inventory slots
 # right above it by pressing [swap items] while crouching.

From 0c348921384afb1beda44de6ea31ea348bea81e1 Mon Sep 17 00:00:00 2001
From: Aria Sangarin <ariahyrule@gmail.com>
Date: Wed, 26 Feb 2020 13:13:50 +0100
Subject: [PATCH 2/3] Fixed a bug when NPCs would trigger MythicMob exp
 (causing an error)

---
 .../comp/mythicmobs/load/KillMythicMobExperienceSource.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/KillMythicMobExperienceSource.java b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/KillMythicMobExperienceSource.java
index 9896ebb5..ebf047eb 100644
--- a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/KillMythicMobExperienceSource.java
+++ b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/KillMythicMobExperienceSource.java
@@ -31,7 +31,7 @@ public class KillMythicMobExperienceSource extends SpecificExperienceSource<Stri
 					@Override
 					public void run() {
 						if (!event.getEntity().isDead()) return;
-						if (!(event.getKiller() instanceof Player)) return;
+						if (!(event.getKiller() instanceof Player) && !event.getKiller().hasMetadata("NPC")) return;
 
 						PlayerData data = PlayerData.get((Player) event.getKiller());
 						for (KillMythicMobExperienceSource source : getSources())

From cf5647a72ccff8716a38d9c5499faa0c22b69c4b Mon Sep 17 00:00:00 2001
From: Aria Sangarin <ariahyrule@gmail.com>
Date: Wed, 26 Feb 2020 18:34:41 +0100
Subject: [PATCH 3/3] Fixed another bug when running without MMOItems

---
 src/main/java/net/Indyuce/mmocore/api/player/Professions.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/net/Indyuce/mmocore/api/player/Professions.java b/src/main/java/net/Indyuce/mmocore/api/player/Professions.java
index 689b2030..edcb3ff0 100644
--- a/src/main/java/net/Indyuce/mmocore/api/player/Professions.java
+++ b/src/main/java/net/Indyuce/mmocore/api/player/Professions.java
@@ -3,7 +3,6 @@ package net.Indyuce.mmocore.api.player;
 import java.util.HashMap;
 import java.util.Map;
 
-import net.Indyuce.mmoitems.MMOItems;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
@@ -87,7 +86,7 @@ public class Professions {
 		exp.put(profession.getId(), exp.containsKey(profession.getId()) ? exp.get(profession.getId()) + value : value);
 
 		// display hologram
-		if (MMOItems.plugin.getConfig().getBoolean("game-indicators.exp.enabled")) {
+		if (MMOCore.plugin.getConfig().getBoolean("display-exp-holograms")) {
 			if (loc != null && MMOCore.plugin.hologramSupport != null)
 				MMOCore.plugin.hologramSupport.displayIndicator(loc.add(.5, 1.5, .5), MMOCore.plugin.configManager.getSimpleMessage("exp-hologram", "exp", "" + value).message(), playerData.getPlayer());
 		}