fix: fix onContainerChange

fix: fix Command Player
fix: fix some cancellable events

Author: ShrBox

src/legacy/api/CommandAPI.cpp

@@ -7,6 +7,7 @@
 #include "api/EntityAPI.h"
 #include "api/ItemAPI.h"
 #include "api/McAPI.h"
+#include "api/PlayerAPI.h"
 #include "engine/EngineOwnData.h"
 #include "engine/GlobalShareData.h"
 #include "engine/LocalShareData.h"
@@ -112,7 +113,7 @@ Local<Value> convertResult(ParamStorageType const& result, CommandOrigin const&
     } else if (result.hold(ParamKind::Kind::Player)) {
         auto arr = Array::newArray();
         for (auto i : std::get<CommandSelector<Player>>(result.value()).results(origin)) {
-            arr.add(EntityClass::newEntity(i));
+            arr.add(PlayerClass::newPlayer(i));
         }
         return arr;
     } else if (result.hold(ParamKind::Kind::BlockPos)) {

src/legacy/api/EventAPI.cpp

@@ -144,15 +144,21 @@ void EnableEventListener(int eventId) {
     switch ((EVENT_TYPES)eventId) {
     case EVENT_TYPES::onJoin:
         bus.emplaceListener<PlayerJoinEvent>([](PlayerJoinEvent& ev) {
-            IF_LISTENED(EVENT_TYPES::onJoin) { CallEvent(EVENT_TYPES::onJoin, PlayerClass::newPlayer(&ev.self())); }
+            IF_LISTENED(EVENT_TYPES::onJoin) {
+                if (!CallEvent(EVENT_TYPES::onJoin, PlayerClass::newPlayer(&ev.self()))) {
+                    ev.cancel();
+                }
+            }
             IF_LISTENED_END(EVENT_TYPES::onJoin);
         });
         break;
 
     case EVENT_TYPES::onPreJoin:
         bus.emplaceListener<PlayerConnectEvent>([](PlayerConnectEvent& ev) {
             IF_LISTENED(EVENT_TYPES::onPreJoin) {
-                CallEvent(EVENT_TYPES::onPreJoin, PlayerClass::newPlayer(&ev.self()));
+                if (!CallEvent(EVENT_TYPES::onPreJoin, PlayerClass::newPlayer(&ev.self()))) {
+                    ev.cancel();
+                }
             }
             IF_LISTENED_END(EVENT_TYPES::onPreJoin);
         });
@@ -170,7 +176,13 @@ void EnableEventListener(int eventId) {
     case EVENT_TYPES::onChat:
         bus.emplaceListener<PlayerChatEvent>([](PlayerChatEvent& ev) {
             IF_LISTENED(EVENT_TYPES::onChat) {
-                CallEvent(EVENT_TYPES::onChat, PlayerClass::newPlayer(&ev.self()), String::newString(ev.message()));
+                if (!CallEvent(
+                        EVENT_TYPES::onChat,
+                        PlayerClass::newPlayer(&ev.self()),
+                        String::newString(ev.message())
+                    )) {
+                    ev.cancel();
+                }
             }
             IF_LISTENED_END(EVENT_TYPES::onChat);
         });
@@ -191,11 +203,13 @@ void EnableEventListener(int eventId) {
     case EVENT_TYPES::onAttackEntity:
         bus.emplaceListener<PlayerAttackEvent>([](PlayerAttackEvent& ev) {
             IF_LISTENED(EVENT_TYPES::onAttackEntity) {
-                CallEvent(
-                    EVENT_TYPES::onAttackEntity,
-                    PlayerClass::newPlayer(&ev.self()),
-                    EntityClass::newEntity(&ev.target())
-                );
+                if (!CallEvent(
+                        EVENT_TYPES::onAttackEntity,
+                        PlayerClass::newPlayer(&ev.self()),
+                        EntityClass::newEntity(&ev.target())
+                    )) {
+                    ev.cancel();
+                }
             }
             IF_LISTENED_END(EVENT_TYPES::onAttackEntity);
         });

src/legacy/api/LoggerAPI.cpp

@@ -159,11 +159,7 @@ Local<Value> LoggerClass::setFile(const Arguments& args) {
         std::filesystem::path             newFile = std::filesystem::path(args[0].asString().toString());
         std::shared_ptr<ll::io::FileSink> sink    = std::make_shared<ll::io::FileSink>(
             newFile,
-            ll::makePolymorphic<ll::io::PatternFormatter>(
-                "{3:.3%T.} {2} {1} {0}",
-                ll::io::Formatter::supportColorLog(),
-                0b0010
-            ),
+            ll::makePolymorphic<ll::io::PatternFormatter>("{3:.3%T.} {2} {1} {0}", false),
             std::ios::app
         );
         if (args.size() >= 2) {

src/lse/events/EventHooks.cpp

@@ -261,20 +261,17 @@ LL_TYPE_INSTANCE_HOOK(
     ItemStack const& newItem
 ) {
     IF_LISTENED(EVENT_TYPES::onContainerChange) {
-        Actor* actor = _getEntity();
-        if (actor && actor->isType(ActorType::Player)) {
-            Player* player = static_cast<Player*>(actor);
-            if (player->hasOpenContainer()) {
-                if (!CallEvent(
-                        EVENT_TYPES::onContainerChange,
-                        PlayerClass::newPlayer(player),
-                        BlockClass::newBlock(mUnk74419a.as<BlockPos>(), player->getDimensionId()),
-                        Number::newNumber(slotNumber + this->_getContainerOffset()),
-                        ItemClass::newItem(&const_cast<ItemStack&>(oldItem)),
-                        ItemClass::newItem(&const_cast<ItemStack&>(newItem))
-                    )) {
-                    return;
-                }
+        Player& player = mUnk84d147.as<Player&>();
+        if (player.hasOpenContainer()) {
+            if (!CallEvent(
+                    EVENT_TYPES::onContainerChange,
+                    PlayerClass::newPlayer(&player),
+                    BlockClass::newBlock(mUnk74419a.as<BlockPos>(), player.getDimensionId()),
+                    Number::newNumber(slotNumber + this->_getContainerOffset()),
+                    ItemClass::newItem(&const_cast<ItemStack&>(oldItem)),
+                    ItemClass::newItem(&const_cast<ItemStack&>(newItem))
+                )) {
+                return;
             }
         }
     }
@@ -501,12 +498,14 @@ LL_TYPE_INSTANCE_HOOK(
     WitherBoss::WitherAttackType type
 ) {
     IF_LISTENED(EVENT_TYPES::onWitherBossDestroy) {
-        CallEvent(
-            EVENT_TYPES::onWitherBossDestroy,
-            EntityClass::newEntity(this),
-            IntPos::newPos(bb.min, region.getDimensionId()),
-            IntPos::newPos(bb.max, region.getDimensionId())
-        );
+        if (!CallEvent(
+                EVENT_TYPES::onWitherBossDestroy,
+                EntityClass::newEntity(this),
+                IntPos::newPos(bb.min, region.getDimensionId()),
+                IntPos::newPos(bb.max, region.getDimensionId())
+            )) {
+            return;
+        }
     }
     IF_LISTENED_END(EVENT_TYPES::onWitherBossDestroy);
     origin(level, bb, region, range, type);

src/tests/LSETests/ScriptTests.js

@@ -1,7 +1,5 @@
 export function loggerTest(player) {
-    if (player) {
-        logger.setPlayer(player)
-    }
+    logger.setPlayer(player)
     logger.setFile("logs/LegacyScriptEngine/ScriptTests.log");
     logger.log("This is a log message");
     logger.warn("This is a warning message");