Skip to content

Commit ba52fda

Browse files
committed
fix: fix event cancellation
1 parent 4b0660e commit ba52fda

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

src/legacy/api/EventAPI.cpp

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -288,12 +288,14 @@ void EnableEventListener(int eventId) {
288288
++truePos.x;
289289
break;
290290
}
291-
CallEvent(
292-
EVENT_TYPES::onPlaceBlock,
293-
PlayerClass::newPlayer(&ev.self()),
294-
BlockClass::newBlock(truePos, ev.self().getDimensionId()),
295-
Number::newNumber((schar)ev.face())
296-
);
291+
if (!CallEvent(
292+
EVENT_TYPES::onPlaceBlock,
293+
PlayerClass::newPlayer(&ev.self()),
294+
BlockClass::newBlock(truePos, ev.self().getDimensionId()),
295+
Number::newNumber((schar)ev.face())
296+
)) {
297+
ev.cancel();
298+
}
297299
}
298300
IF_LISTENED_END(EVENT_TYPES::onPlaceBlock);
299301
});
@@ -884,7 +886,9 @@ void InitBasicEventListeners() {
884886

885887
// Other Cmd
886888
IF_LISTENED(EVENT_TYPES::onPlayerCmd) {
887-
CallEvent(EVENT_TYPES::onPlayerCmd, PlayerClass::newPlayer(player), String::newString(cmd));
889+
if (!CallEvent(EVENT_TYPES::onPlayerCmd, PlayerClass::newPlayer(player), String::newString(cmd))) {
890+
ev.cancel();
891+
}
888892
}
889893
IF_LISTENED_END(EVENT_TYPES::onPlayerCmd);
890894
}

0 commit comments

Comments
 (0)