Added JobEvent

Auxilor · Feb 8, 2023 · 91645c1 · 91645c1
1 parent 420279f
commit 91645c1
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/api/event/JobEvent.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/api/event/JobEvent.kt
@@ -0,0 +1,7 @@
+package com.willfp.ecojobs.api.event
+
+import com.willfp.ecojobs.jobs.Job
+
+interface JobEvent {
+    val job: Job
+}
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/api/event/PlayerJobExpGainEvent.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/api/event/PlayerJobExpGainEvent.kt
@@ -8,10 +8,10 @@ import org.bukkit.event.Cancellable
 
 class PlayerJobExpGainEvent(
     who: Player,
-    val job: Job,
+    override val job: Job,
     var amount: Double,
     val isMultiply: Boolean
-) : PlayerEvent(who), Cancellable {
+) : PlayerEvent(who), Cancellable, JobEvent {
     private var cancelled = false
 
     override fun setCancelled(cancel: Boolean) {

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
@@ -8,9 +8,9 @@ import org.bukkit.event.HandlerList
 
 class PlayerJobJoinEvent(
     val player: OfflinePlayer,
-    val job: Job,
+    override val job: Job,
     val oldJob: Job?
-) : Event(), Cancellable {
+) : Event(), Cancellable, JobEvent {
     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
@@ -8,8 +8,8 @@ import org.bukkit.event.HandlerList
 
 class PlayerJobLeaveEvent(
     val player: OfflinePlayer,
-    val job: Job
-) : Event(), Cancellable {
+    override val job: Job
+) : Event(), Cancellable, JobEvent {
     private var cancelled = false
 
     override fun isCancelled() = this.cancelled

diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/api/event/PlayerJobLevelUpEvent.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/api/event/PlayerJobLevelUpEvent.kt
@@ -7,9 +7,9 @@ import org.bukkit.event.HandlerList
 
 class PlayerJobLevelUpEvent(
     who: Player,
-    val job: Job,
+    override val job: Job,
     val level: Int
-) : PlayerEvent(who) {
+) : PlayerEvent(who), JobEvent {
     override fun getHandlers(): HandlerList {
         return handlerList
     }

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
 #libreforge-updater
 #Tue Feb 07 14:45:38 GMT 2023
-version=1.34.2
+version=1.35.0
 plugin-name=EcoJobs