fix: add in a fallback to guild skulls not loading properly

guilds-plugin · Jan 18, 2024 · d8b2fb3 · d8b2fb3
1 parent ab50307
commit d8b2fb3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/main/kotlin/me/glaremasters/guilds/commands/admin/CommandDebug.kt b/src/main/kotlin/me/glaremasters/guilds/commands/admin/CommandDebug.kt
@@ -0,0 +1,4 @@
+package me.glaremasters.guilds.commands.admin
+
+class CommandDebug {
+}
diff --git a/src/main/kotlin/me/glaremasters/guilds/guis/ListGUI.kt b/src/main/kotlin/me/glaremasters/guilds/guis/ListGUI.kt
@@ -100,7 +100,13 @@ class ListGUI(private val guilds: Guilds, private val settingsManager: SettingsM
     private fun setListItem(guild: Guild, player: Player) {
         val defaultUrl = settingsManager.getProperty(GuildListSettings.GUILD_LIST_HEAD_DEFAULT_URL)
         val useDefaultUrl = settingsManager.getProperty(GuildListSettings.USE_DEFAULT_TEXTURE)
-        val item = if (!useDefaultUrl) guild.skull else GuildSkull(defaultUrl).itemStack
+
+        val item = if (!useDefaultUrl && guild.skull !== null && guild.guildSkull !== null) {
+            guild.skull
+        } else {
+            GuildSkull(defaultUrl).itemStack
+        }
+
         val meta = item.itemMeta
         var name = settingsManager.getProperty(GuildListSettings.GUILD_LIST_ITEM_NAME)