BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2026-04-07 00:06:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

more work on the lua stuff

Browse Source
This commit is contained in:
Luuk van Oijen
2023-11-14 09:53:46 +01:00
parent e781bbac8e
commit 1c21298351
5 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/plugins/backend_lua.rs
View File

@@ -133,7 +133,7 @@ impl Backend for BackendLua {
Ok(())
}
fn call_event_handler(&mut self, event: ScriptEvent, args: Vec<Argument>) {
fn call_event_handler(&mut self, event: ScriptEvent, args: Vec<Argument>, resp: Option<oneshot::Sender<Argument>>) {
let event_name = match event {
ScriptEvent::OnPluginLoaded => "onPluginLoaded",
ScriptEvent::OnPlayerAuthenticated => "onPlayerAuthenticated",
@@ -152,8 +152,12 @@ impl Backend for BackendLua {
Argument::Number(f) => Some(Value::Number(f as f64)),
}
}).filter(|v| v.is_some());
if let Err(e) = func.call::<_, ()>(Variadic::from_iter(mapped_args)) {
error!("[LUA] {}", e);
match func.call::<_, Option<f32>>(Variadic::from_iter(mapped_args)) {
Ok(res) => if let Some(resp) = resp { resp.send(Argument::Number(res.unwrap_or(-1f32))).expect("Failed to send!"); } else {}
Err(e) => {
error!("[LUA] {}", e);
if let Some(resp) = resp { resp.send(Argument::Number(-1f32)).expect("Failed to send!"); } else {}
},
}
}
}

10
src/server/plugins/mod.rs
View File

@@ -13,12 +13,12 @@ pub trait Backend: Send {
fn load(&mut self, code: String) -> anyhow::Result<()>;
fn load_api(&mut self, tx: Arc<Sender<ServerBoundPluginEvent>>) -> anyhow::Result<()>;
fn call_event_handler(&mut self, event: ScriptEvent, args: Vec<Argument>);
fn call_event_handler(&mut self, event: ScriptEvent, args: Vec<Argument>, resp: Option<oneshot::Sender<Argument>>);
}
// TODO: This is quite focused on Lua right now, perhaps in the future we want to modify this list
// to be more versatile?
#[derive(Debug)]
#[derive(Debug, Clone)]
pub enum Argument {
String(String),
Boolean(bool),
@@ -33,7 +33,7 @@ pub enum ScriptEvent {
#[derive(Debug)]
pub enum PluginBoundPluginEvent {
CallEventHandler((ScriptEvent, Vec<Argument>)),
CallEventHandler((ScriptEvent, Vec<Argument>, Option<oneshot::Sender<Argument>>)),
PlayerCount(usize),
Players(HashMap<u8, String>),
@@ -72,8 +72,8 @@ impl Plugin {
loop {
if let Some(message) = pb_rx.blocking_recv() {
match message {
PluginBoundPluginEvent::CallEventHandler((event, args)) => {
backend.call_event_handler(event, args);
PluginBoundPluginEvent::CallEventHandler((event, args, resp)) => {
backend.call_event_handler(event, args, resp);
},
_ => {},
}