Merge remote-tracking branch 'origin/master'

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillCombat.kt

@@ -7,8 +7,11 @@ import com.willfp.ecoskills.skills.Skill
 import com.willfp.ecoskills.tryAsPlayer
 import org.bukkit.GameMode
 import org.bukkit.attribute.Attribute
+import org.bukkit.entity.Monster
 import org.bukkit.event.EventHandler
 import org.bukkit.event.EventPriority
+import org.bukkit.event.entity.CreatureSpawnEvent
+import org.bukkit.metadata.FixedMetadataValue
 
 class SkillCombat : Skill(
     "combat"
@@ -29,7 +32,19 @@ class SkillCombat : Skill(
             return
         }
 
+        if (this.config.getBool("skills.prevent-levelling-from-spawners") && event.victim.hasMetadata("ecoIsSpawner")) {
+            return
+        }
+
         val xp = event.victim.getAttribute(Attribute.GENERIC_MAX_HEALTH)!!.value * this.config.getDouble("xp-per-heart")
         player.giveSkillExperience(this, xp)
     }
+
+    @EventHandler
+    fun onSpawn(event: CreatureSpawnEvent) {
+        if (event.spawnReason == CreatureSpawnEvent.SpawnReason.SPAWNER) {
+            event.entity.setMetadata("ecoIsSpawner", FixedMetadataValue(this.plugin, true))
+        }
+    }
+
 }

eco-core/core-plugin/src/main/resources/skills/combat.yml

@@ -3,6 +3,9 @@ description: "Kill mobs to earn Combat XP"
 max-level: 50
 disabled-in-worlds: []
 
+# Prevent gaining xp killing mobs from spawners
+prevent-levelling-from-spawners: true
+
 gui:
   item: 'player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZGVlYmI4YjAzY2QyN2QzNDM1ZTExNTYxNmI4ZWQzNWRjYjQyN2FmNWIwYjFjYzUyNmQzMjY1YTcyZDQ5M2UifX19'
   position: