Skip to content

bug fixes #484

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

Draft
OhmV-IR wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

bug fixes #484

Show file tree
Hide file tree
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
22 changes: 16 additions & 6 deletions pylon-core/src/main/kotlin/io/github/pylonmc/pylon/core/block/BlockListener.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ import io.github.pylonmc.pylon.core.item.PylonItem
import io.github.pylonmc.pylon.core.item.research.Research.Companion.canUse
import io.github.pylonmc.pylon.core.util.damageItem
import io.github.pylonmc.pylon.core.util.isFakeEvent
import io.papermc.paper.command.brigadier.argument.ArgumentTypes.player
import io.papermc.paper.datacomponent.DataComponentTypes
import io.papermc.paper.event.block.*
import io.papermc.paper.event.entity.EntityCompostItemEvent
import io.papermc.paper.event.player.*
import org.bukkit.GameMode
import org.bukkit.Material
import org.bukkit.block.Container
import org.bukkit.entity.memory.MemoryKey
import org.bukkit.event.Event
import org.bukkit.event.EventHandler
import org.bukkit.event.EventPriority
Expand All @@ -30,11 +30,8 @@ import org.bukkit.event.block.BellRingEvent
import org.bukkit.event.enchantment.EnchantItemEvent
import org.bukkit.event.enchantment.PrepareItemEnchantEvent
import org.bukkit.event.entity.EntityExplodeEvent
import org.bukkit.event.inventory.BrewingStandFuelEvent
import org.bukkit.event.inventory.FurnaceBurnEvent
import org.bukkit.event.inventory.FurnaceExtractEvent
import org.bukkit.event.inventory.InventoryMoveItemEvent
import org.bukkit.event.inventory.InventoryOpenEvent
import org.bukkit.event.entity.VillagerCareerChangeEvent
import org.bukkit.event.inventory.*
import org.bukkit.event.player.PlayerBucketEmptyEvent
import org.bukkit.event.player.PlayerInteractEvent
import org.bukkit.event.player.PlayerTakeLecternBookEvent
Expand Down Expand Up @@ -834,6 +831,19 @@ internal object BlockListener : Listener {
}
}

@EventHandler
private fun onVillagerCareerChange(event: VillagerCareerChangeEvent) {
if (event.reason != VillagerCareerChangeEvent.ChangeReason.EMPLOYED) {
return;
}
val jobsite = event.entity.getMemory(MemoryKey.JOB_SITE)
jobsite ?: return
val block = BlockStorage.get(jobsite.block)
if (block is PylonJobBlock) {
block.onVillagerGetJob(event)
}
}

@JvmSynthetic
internal fun logEventHandleErr(event: Event?, e: Exception, block: PylonBlock) {
if (event != null) {
Expand Down
7 changes: 7 additions & 0 deletions pylon-core/src/main/kotlin/io/github/pylonmc/pylon/core/block/base/PylonJobBlock.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package io.github.pylonmc.pylon.core.block.base

import org.bukkit.event.entity.VillagerCareerChangeEvent

interface PylonJobBlock {
fun onVillagerGetJob(event: VillagerCareerChangeEvent)
}