Merge remote-tracking branch 'origin/master'
# Conflicts: # build.gradle # gradle.properties
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package com.willfp.talismans.display
|
||||
|
||||
import com.willfp.eco.core.EcoPlugin
|
||||
import com.willfp.eco.core.display.Display
|
||||
import com.willfp.eco.core.display.DisplayModule
|
||||
import com.willfp.eco.core.display.DisplayPriority
|
||||
import com.willfp.talismans.talismans.util.TalismanChecks
|
||||
@@ -34,10 +35,10 @@ class TalismanDisplay(plugin: EcoPlugin) : DisplayModule(plugin, DisplayPriority
|
||||
lore.addAll(itemLore)
|
||||
|
||||
if (player != null) {
|
||||
val lines = talisman.getNotMetLines(player)
|
||||
val lines = talisman.getNotMetLines(player).map { Display.PREFIX + it }
|
||||
|
||||
if (lines.isNotEmpty()) {
|
||||
lore.add("")
|
||||
lore.add(Display.PREFIX)
|
||||
lore.addAll(lines)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user