From 035550db06fa7d32ca36546c00c3b4494f6a6ddf Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Wed, 9 Feb 2022 13:07:47 +0000
Subject: [PATCH] Added player to boss spawn event

---
 .../main/kotlin/com/willfp/ecobosses/commands/CommandSpawn.kt | 3 ++-
 .../main/kotlin/com/willfp/ecobosses/events/BossSpawnEvent.kt | 4 +++-
 .../main/kotlin/com/willfp/ecobosses/spawn/SpawnEggHandler.kt | 2 +-
 .../kotlin/com/willfp/ecobosses/spawn/SpawnTotemHandler.kt    | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/commands/CommandSpawn.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/commands/CommandSpawn.kt
index ecb1321..859c286 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/commands/CommandSpawn.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/commands/CommandSpawn.kt
@@ -110,7 +110,8 @@ class CommandSpawn(plugin: EcoBossesPlugin) : Subcommand(
         val event = BossSpawnEvent(
             boss,
             location,
-            BossSpawnEvent.SpawnReason.COMMAND
+            BossSpawnEvent.SpawnReason.COMMAND,
+            null
         )
 
         Bukkit.getPluginManager().callEvent(event)
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/events/BossSpawnEvent.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/events/BossSpawnEvent.kt
index 615ee99..4b7300b 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/events/BossSpawnEvent.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/events/BossSpawnEvent.kt
@@ -2,6 +2,7 @@ package com.willfp.ecobosses.events
 
 import com.willfp.ecobosses.bosses.EcoBoss
 import org.bukkit.Location
+import org.bukkit.entity.Player
 import org.bukkit.event.Cancellable
 import org.bukkit.event.Event
 import org.bukkit.event.HandlerList
@@ -9,7 +10,8 @@ import org.bukkit.event.HandlerList
 class BossSpawnEvent(
     val boss: EcoBoss,
     val location: Location,
-    val reason: SpawnReason
+    val reason: SpawnReason,
+    val spawner: Player?
 ) : Event(), Cancellable {
     private var isCancelled: Boolean = false
 
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnEggHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnEggHandler.kt
index 066ba02..7bf0cc7 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnEggHandler.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnEggHandler.kt
@@ -33,7 +33,7 @@ class SpawnEggHandler : Listener {
             return
         }
 
-        val spawnEvent = BossSpawnEvent(boss, location, BossSpawnEvent.SpawnReason.EGG)
+        val spawnEvent = BossSpawnEvent(boss, location, BossSpawnEvent.SpawnReason.EGG, player)
 
         Bukkit.getPluginManager().callEvent(spawnEvent)
 
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnTotemHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnTotemHandler.kt
index 1b47461..8868645 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnTotemHandler.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnTotemHandler.kt
@@ -55,7 +55,7 @@ class SpawnTotemHandler : Listener {
                     return
                 }
 
-                val spawnEvent = BossSpawnEvent(boss, event.block.location, BossSpawnEvent.SpawnReason.TOTEM)
+                val spawnEvent = BossSpawnEvent(boss, event.block.location, BossSpawnEvent.SpawnReason.TOTEM, player)
 
                 if (!spawnEvent.isCancelled) {
                     block1.type = Material.AIR