From 36f6765942444e94944f8aa2f5677aaeeac7a3ce Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Wed, 14 Sep 2022 13:32:05 +0100
Subject: [PATCH] Fixed bug

---
 .../com/willfp/ecojobs/api/event/PlayerJobJoinEvent.kt    | 6 ++++--
 .../com/willfp/ecojobs/api/event/PlayerJobLeaveEvent.kt   | 8 ++++----
 .../src/main/kotlin/com/willfp/ecojobs/jobs/Job.kt        | 4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/api/event/PlayerJobJoinEvent.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/api/event/PlayerJobJoinEvent.kt
index e269ddc..4417c55 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/api/event/PlayerJobJoinEvent.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/api/event/PlayerJobJoinEvent.kt
@@ -1,16 +1,18 @@
 package com.willfp.ecojobs.api.event
 
 import com.willfp.ecojobs.jobs.Job
+import org.bukkit.OfflinePlayer
 import org.bukkit.entity.Player
 import org.bukkit.event.Cancellable
+import org.bukkit.event.Event
 import org.bukkit.event.HandlerList
 import org.bukkit.event.player.PlayerEvent
 
 class PlayerJobJoinEvent(
-    who: Player,
+    val player: OfflinePlayer,
     val job: Job,
     val oldJob: Job?
-) : PlayerEvent(who), Cancellable {
+) : Event(), Cancellable {
     private var cancelled = false
 
     override fun isCancelled() = this.cancelled
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/api/event/PlayerJobLeaveEvent.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/api/event/PlayerJobLeaveEvent.kt
index 2e516ac..956378f 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/api/event/PlayerJobLeaveEvent.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/api/event/PlayerJobLeaveEvent.kt
@@ -1,15 +1,15 @@
 package com.willfp.ecojobs.api.event
 
 import com.willfp.ecojobs.jobs.Job
-import org.bukkit.entity.Player
+import org.bukkit.OfflinePlayer
 import org.bukkit.event.Cancellable
+import org.bukkit.event.Event
 import org.bukkit.event.HandlerList
-import org.bukkit.event.player.PlayerEvent
 
 class PlayerJobLeaveEvent(
-    who: Player,
+    val player: OfflinePlayer,
     val job: Job
-) : PlayerEvent(who), Cancellable {
+) : Event(), Cancellable {
     private var cancelled = false
 
     override fun isCancelled() = this.cancelled
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/Job.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/Job.kt
index cdbf828..944db97 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/Job.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/Job.kt
@@ -378,7 +378,7 @@ var OfflinePlayer.activeJob: Job?
         if (oldJob != job) {
             // Have to check for oldJob too to have null safety
             if (job == null && oldJob != null) {
-                val event = PlayerJobLeaveEvent(player, oldJob)
+                val event = PlayerJobLeaveEvent(this, oldJob)
                 Bukkit.getPluginManager().callEvent(event)
 
                 if (event.isCancelled) {
@@ -388,7 +388,7 @@ var OfflinePlayer.activeJob: Job?
 
             // Not using else because null safety as well
             if (job != null) {
-                val event = PlayerJobJoinEvent(player, job, oldJob)
+                val event = PlayerJobJoinEvent(this, job, oldJob)
                 Bukkit.getPluginManager().callEvent(event)
 
                 if (event.isCancelled) {