Skip to content

Add support for setting event priority #19

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.

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

Merged
merged 1 commit into from
May 21, 2025
Merged
Changes from all commits
Commits
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
21 changes: 15 additions & 6 deletions src/main/resources/lua/script.lua
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ function Script.new(name, server, plugin, logger, debug)
if not eventClass then
error("Event " .. eventClass .. " not found")
end
for _, handler in ipairs(eventHandlers) do

for _, entry in ipairs(eventHandlers) do
local handler = entry.handler
local priority = entry.priority or EventPriority.NORMAL
local eventExecutor = {}
function eventExecutor:execute(listener, event)
local function errorHandler(err)
Expand All @@ -62,7 +65,7 @@ function Script.new(name, server, plugin, logger, debug)

local eventProxy = java.proxy("org.bukkit.plugin.EventExecutor", eventExecutor)
local listenerProxy = java.proxy("org.bukkit.event.Listener", {})
server:getPluginManager():registerEvent(eventClass, listenerProxy, EventPriority.NORMAL, eventProxy, plugin)
server:getPluginManager():registerEvent(eventClass, listenerProxy, priority, eventProxy, plugin)
table.insert(self.listeners, listenerProxy)
end
end
Expand Down Expand Up @@ -192,20 +195,26 @@ function Script:registerCommand(handler, metadata)
end

-- Register a hook for a server event
---@public
---@param event JavaClasses|string Event name
---@param priority org.bukkit.event.EventPriority Optional event priority
---@param handler fun(event: any) Function to handle the event
function Script:registerListener(event, handler)
---@overload fun(event: string, handler: fun(event: any))
---@return nil
function Script:registerListener(event, priority, handler)
if type(event) ~= "string" then
error("Event name must be a string")
end

if handler == nil and type(priority) == "function" then
handler = priority
priority = EventPriority.NORMAL
end
if type(handler) ~= "function" then
error("Event handler must be a function")
end

if not self.hooks[event] then
self.hooks[event] = {}
end

table.insert(self.hooks[event], handler)
table.insert(self.hooks[event], {priority = priority, handler = handler})
end