Skip to content

Fixed some pet egg related issues caused by WorldGuard #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Exteron01 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed some pet egg related issues caused by WorldGuard #65

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/pets/SpawnEggHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import com.willfp.eco.core.EcoPlugin
import org.bukkit.entity.Player
import org.bukkit.event.Event
import org.bukkit.event.EventHandler
import org.bukkit.event.EventPriority
import org.bukkit.event.Listener
import org.bukkit.event.block.Action
import org.bukkit.event.player.PlayerInteractEvent
Expand All @@ -13,16 +14,17 @@ class SpawnEggHandler(
private val plugin: EcoPlugin
) : Listener {
@EventHandler(
ignoreCancelled = true
priority = EventPriority.HIGHEST,
ignoreCancelled = false
)
fun handle(event: PlayerInteractEvent) {
if (event.action != Action.RIGHT_CLICK_BLOCK) {
if (event.action != Action.RIGHT_CLICK_AIR && event.action != Action.RIGHT_CLICK_BLOCK) {
return
}

val player = event.player

val item = event.item ?: return

val pet = item.petEgg ?: return

event.isCancelled = true
Expand All @@ -42,5 +44,7 @@ class SpawnEggHandler(
}

player.setPetLevel(pet, 1)

player.sendMessage(plugin.langYml.getMessage("pet-activated").replace("%pet%", pet.name))
}
}