Merge branch 'main' of https://github.com/xenondevs/Nova into main

xenondevs · Sep 26, 2021 · ee1551c · ee1551c
2 parents 6e5ca37 + b5a959c
commit ee1551c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/kotlin/xyz/xenondevs/nova/world/LootGeneration.kt b/src/main/kotlin/xyz/xenondevs/nova/world/LootGeneration.kt
@@ -1,6 +1,7 @@
 package xyz.xenondevs.nova.world
 
 import org.bukkit.Bukkit
+import org.bukkit.NamespacedKey
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 import org.bukkit.event.world.LootGenerateEvent
@@ -12,6 +13,8 @@ import kotlin.random.Random
 
 object LootGeneration : Listener {
 
+    @Suppress("DEPRECATION") // We need to specify the minecraft namespace explicitly
+    private val IGNORED_LOOT_TABLES = listOf(NamespacedKey("minecraft", "chests/jungle_temple_dispenser"))
     private val lootFrequency = HashMap<String, Pair<Int, Int>>()
     private val possibleLoot = ArrayList<NovaMaterial>()
 
@@ -28,7 +31,7 @@ object LootGeneration : Listener {
 
     @EventHandler
     fun handleLootGenerationEvent(event: LootGenerateEvent) {
-        if (event.lootTable.key.toString() == "minecraft:chests/jungle_temple_dispenser") return
+        if (event.lootTable.key in IGNORED_LOOT_TABLES) return
 
         for (material in possibleLoot) {
             val name = material.typeName.lowercase()