Skip to content

Commit f9a72bf

Browse files
committed
chore: disable onNpcCmd temporarily
1 parent c54bde5 commit f9a72bf

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

src/legacy/api/EventAPI.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ bool LLSECallEventsOnHotUnload(ScriptEngine* engine) {
147147

148148
//////////////////// Events ////////////////////
149149

150-
// TODO:
151150
void EnableEventListener(int eventId) {
152151
using namespace ll::event;
153152
EventBus& bus = EventBus::getInstance();

src/legacy/api/SimulatedPlayerAPI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ Local<Value> PlayerClass::simulateDestroy(const Arguments& args) {
145145
CHECK_ARG_TYPE(args[index], ValueKind::kNumber);
146146
face = (ScriptModuleMinecraft::ScriptFacing)args[index].asNumber().toInt32();
147147
}
148-
// TODO
148+
149149
return Boolean::newBoolean(sp->simulateDestroyBlock(bpos, face));
150150
}
151151
CATCH("Fail in " __FUNCTION__ "!")

src/lse/events/EntityEvents.cpp

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ LL_TYPE_INSTANCE_HOOK(
280280
return origin(source, damage);
281281
}
282282

283+
// TODO: fix this event, can't get correct vector via mUnke14f11
283284
LL_TYPE_INSTANCE_HOOK(
284285
NpcCommandHook,
285286
HookPriority::Normal,
@@ -292,10 +293,10 @@ LL_TYPE_INSTANCE_HOOK(
292293
::std::string const& sceneName
293294
) {
294295
IF_LISTENED(EVENT_TYPES::onNpcCmd) {
295-
auto& actionContainer =
296-
mActionsContainer->mUnke14f11.as<std::vector<std::variant<npc::CommandAction, npc::UrlAction>>>();
297-
lse::LegacyScriptEngine::getInstance().getSelf().getLogger().info("Size: {}", actionContainer.size());
298-
auto& action = actionContainer.at(actionIndex);
296+
auto& action =
297+
mActionsContainer->mUnke14f11.as<std::vector<std::variant<npc::CommandAction, npc::UrlAction>>>().at(
298+
actionIndex
299+
);
299300
if (std::holds_alternative<npc::CommandAction>(action)) {
300301
auto& commands = std::get<npc::CommandAction>(action).commands;
301302
std::string command;
@@ -382,7 +383,9 @@ void MobHurtEvent() {
382383
MobHurtHook::hook();
383384
MobHurtEffectHook::hook();
384385
}
385-
void NpcCommandEvent() { NpcCommandHook::hook(); }
386+
void NpcCommandEvent() {
387+
// NpcCommandHook::hook();
388+
}
386389
void EffectUpdateEvent() { EffectUpdateHook::hook(); }
387390
void TransformationEvent() { TransformationHook::hook(); }
388391
} // namespace lse::events::entity

0 commit comments

Comments
 (0)