From a207582985e72a2f0bb569b8aaa466d0f60b7eb8 Mon Sep 17 00:00:00 2001
From: Matias Zwinger <matias.zwinger@protonmail.com>
Date: Fri, 9 Jul 2021 23:08:32 +0300
Subject: [PATCH 1/3] [+] Update to Spigot API 1.17.1

---
 build.gradle                               | 4 ++--
 src/main/kotlin/org/hydev/mc/ActiveList.kt | 4 ++--
 src/main/resources/plugin.yml              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index c0cfe72..11416af 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'org.hydev.kt'
-version = '1.0-SNAPSHOT'
+version = '1.1-SNAPSHOT'
 
 repositories {
     mavenCentral()
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT' // The Spigot API with no shadowing. Requires the OSS repo.
+    compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT' // The Spigot API with no shadowing. Requires the OSS repo.
 }
 
 compileKotlin {
diff --git a/src/main/kotlin/org/hydev/mc/ActiveList.kt b/src/main/kotlin/org/hydev/mc/ActiveList.kt
index 22e3bdf..2ada6b8 100644
--- a/src/main/kotlin/org/hydev/mc/ActiveList.kt
+++ b/src/main/kotlin/org/hydev/mc/ActiveList.kt
@@ -25,7 +25,7 @@ class ActiveList : JavaPlugin(), CommandExecutor
     {
         super.onEnable()
 
-        getCommand("activelist").executor = this
+        getCommand("activelist")!!.setExecutor(this)
     }
 
     override fun onCommand(sender: CommandSender, command: Command, label: String, _args: Array<out String>): Boolean
@@ -54,7 +54,7 @@ class ActiveList : JavaPlugin(), CommandExecutor
             try
             {
                 val yml = YamlConfiguration.loadConfiguration(it)
-                val name = yml.getString("lastAccountName")
+                val name = yml.getString("last-account-name") ?: ""
                 val logoutDate = yml.getLong("timestamps.logout")
                 val money = yml.getString("money") ?: ""
 
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index cff6dbc..05228cc 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -4,7 +4,7 @@ author: Hykilpikonna
 
 main: org.hydev.mc.ActiveList
 version: 1.0
-api-version: 1.14
+api-version: 1.17
 
 load: POSTWORLD
 depend: [Essentials]

From e68b54c2b8a6ce34dee51221334323503f65131c Mon Sep 17 00:00:00 2001
From: Matias Zwinger <matias.zwinger@protonmail.com>
Date: Sat, 10 Jul 2021 14:28:28 +0300
Subject: [PATCH 2/3] [F] Ensure EssentialsX backwards compatibility

---
 src/main/kotlin/org/hydev/mc/ActiveList.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/kotlin/org/hydev/mc/ActiveList.kt b/src/main/kotlin/org/hydev/mc/ActiveList.kt
index 2ada6b8..92d51a2 100644
--- a/src/main/kotlin/org/hydev/mc/ActiveList.kt
+++ b/src/main/kotlin/org/hydev/mc/ActiveList.kt
@@ -54,7 +54,7 @@ class ActiveList : JavaPlugin(), CommandExecutor
             try
             {
                 val yml = YamlConfiguration.loadConfiguration(it)
-                val name = yml.getString("last-account-name") ?: ""
+                val name = yml.getString("last-account-name") ?: yml.getString("lastAccountName") ?: ""
                 val logoutDate = yml.getLong("timestamps.logout")
                 val money = yml.getString("money") ?: ""
 

From 04788c027a13f368bf803329610e6d6e0acb2745 Mon Sep 17 00:00:00 2001
From: Matias Zwinger <matias.zwinger@protonmail.com>
Date: Sat, 10 Jul 2021 14:49:25 +0300
Subject: [PATCH 3/3] [F] Fix version number

---
 src/main/resources/plugin.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 05228cc..453e422 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -3,7 +3,7 @@ description: A plugin to see active players and last login dates
 author: Hykilpikonna
 
 main: org.hydev.mc.ActiveList
-version: 1.0
+version: 1.1
 api-version: 1.17
 
 load: POSTWORLD