fix: fix event cancellation #199

ShrBox · ShrBox · commit 4b0660ea6b49 · 2025-01-05T18:07:09.000+08:00
diff --git a/src/legacy/api/EventAPI.cpp b/src/legacy/api/EventAPI.cpp
@@ -838,7 +838,11 @@ void InitBasicEventListeners() {
                 }
 
                 // Other Cmd
-                IF_LISTENED(EVENT_TYPES::onConsoleCmd) { CallEvent(EVENT_TYPES::onConsoleCmd, String::newString(cmd)); }
+                IF_LISTENED(EVENT_TYPES::onConsoleCmd) {
+                    if (!CallEvent(EVENT_TYPES::onConsoleCmd, String::newString(cmd))) {
+                        ev.cancel();
+                    }
+                }
                 IF_LISTENED_END(EVENT_TYPES::onConsoleCmd);
             }
         } else if (ev.commandContext().mOrigin->getOriginType() == CommandOriginType::Player) {

Original file line number	Diff line number	Diff line change
`@@ -838,7 +838,11 @@ void InitBasicEventListeners() {`
`838`	`838`	`}`
`839`	`839`
`840`	`840`	`// Other Cmd`
`841`		`- IF_LISTENED(EVENT_TYPES::onConsoleCmd) { CallEvent(EVENT_TYPES::onConsoleCmd, String::newString(cmd)); }`
	`841`	`+ IF_LISTENED(EVENT_TYPES::onConsoleCmd) {`
	`842`	`+ if (!CallEvent(EVENT_TYPES::onConsoleCmd, String::newString(cmd))) {`
	`843`	`+ ev.cancel();`
	`844`	`+ }`
	`845`	`+ }`
`842`	`846`	`IF_LISTENED_END(EVENT_TYPES::onConsoleCmd);`
`843`	`847`	`}`
`844`	`848`	`} else if (ev.commandContext().mOrigin->getOriginType() == CommandOriginType::Player) {`