Skip to content

Commit 17eb3a1

Browse files
committed
fix: fix fake command not work
1 parent 489f633 commit 17eb3a1

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

src/legacy/api/EventAPI.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,6 @@ void InitBasicEventListeners() {
794794
}
795795
} else {
796796
if (isFromOtherEngine) {
797-
ev.cancel();
798797
return;
799798
}
800799

@@ -839,7 +838,6 @@ void InitBasicEventListeners() {
839838
}
840839
} else {
841840
if (isFromOtherEngine) {
842-
ev.cancel();
843841
return;
844842
}
845843

src/legacy/api/PlayerAPI.cpp

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#include "engine/GlobalShareData.h"
1717
#include "ll/api/chrono/GameChrono.h"
1818
#include "ll/api/coro/CoroTask.h"
19-
#include "ll/api/event/player/PlayerChatEvent.h"
2019
#include "ll/api/event/EventBus.h"
20+
#include "ll/api/event/player/PlayerChatEvent.h"
2121
#include "ll/api/form/ModalForm.h"
2222
#include "ll/api/service/Bedrock.h"
2323
#include "ll/api/service/GamingStatus.h"
@@ -1430,7 +1430,8 @@ Local<Value> PlayerClass::isMoving() {
14301430
return Local<Value>();
14311431
}
14321432

1433-
return Boolean::newBoolean(SynchedActorDataAccess::getActorFlag(player->getEntityContext(), ActorFlags::Moving)
1433+
return Boolean::newBoolean(
1434+
SynchedActorDataAccess::getActorFlag(player->getEntityContext(), ActorFlags::Moving)
14341435
);
14351436
}
14361437
CATCH("Fail in isMoving!")
@@ -1680,12 +1681,11 @@ Local<Value> PlayerClass::talkAs(const Arguments& args) {
16801681
Player* player = get();
16811682
if (!player) return Local<Value>();
16821683
if (ll::service::getLevel().has_value()) {
1683-
auto msg = args[0].asString().toString();
1684+
auto msg = args[0].asString().toString();
16841685
ll::event::PlayerChatEvent event{*reinterpret_cast<ServerPlayer*>(player), msg};
16851686
ll::event::EventBus::getInstance().publish(event);
16861687
if (event.isCancelled()) return Boolean::newBoolean(false);
1687-
TextPacket pkt =
1688-
TextPacket::createChat(player->getRealName(), msg, {}, player->getXuid(), {});
1688+
TextPacket pkt = TextPacket::createChat(player->getRealName(), msg, {}, player->getXuid(), {});
16891689
ll::service::getLevel()->forEachPlayer([&pkt](Player& player) {
16901690
player.sendNetworkPacket(pkt);
16911691
return true;
@@ -2457,7 +2457,8 @@ Local<Value> PlayerClass::sendSimpleForm(const Arguments& args) {
24572457
}
24582458
}
24592459
auto formCallback = [engine{EngineScope::currentEngine()},
2460-
callback{script::Global(args[4].asFunction())
2460+
callback{
2461+
script::Global(args[4].asFunction())
24612462
}](Player& pl, int chosen, ll::form::FormCancelReason reason) {
24622463
if ((ll::getGamingStatus() != ll::GamingStatus::Running)) return;
24632464
if (!EngineManager::isValid(engine)) return;
@@ -2501,9 +2502,10 @@ Local<Value> PlayerClass::sendModalForm(const Arguments& args) {
25012502
args[2].asString().toString(),
25022503
args[3].asString().toString()
25032504
);
2504-
auto formCallback = [engine{EngineScope::currentEngine()},
2505-
callback{script::Global(args[4].asFunction())
2506-
}](Player& pl, ll::form::ModalFormResult const& chosen, ll::form::FormCancelReason reason
2505+
auto formCallback = [engine{EngineScope::currentEngine()}, callback{script::Global(args[4].asFunction())}](
2506+
Player& pl,
2507+
ll::form::ModalFormResult const& chosen,
2508+
ll::form::FormCancelReason reason
25072509
) {
25082510
if ((ll::getGamingStatus() != ll::GamingStatus::Running)) return;
25092511
if (!EngineManager::isValid(engine)) return;

0 commit comments

Comments
 (0)