Repo-Mirror/EcoJobs
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoJobs.git synced 2025-12-27 02:49:06 +00:00
Code Issues Releases 1 Activity

Fixed bug

Browse Source
This commit is contained in:
Auxilor
2022-09-14 13:32:05 +01:00
parent b96d6c3388
commit 36f6765942
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/api/event/PlayerJobJoinEvent.kt
View File

@@ -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

8
eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/api/event/PlayerJobLeaveEvent.kt
View File

@@ -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

4
eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/Job.kt
View File

@@ -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) {