Release 2.14.1 (#1305)

Author: ShrBox

LiteLoader/include/liteloader/Version.h

@@ -6,7 +6,7 @@
 
 #define LITELOADER_VERSION_MAJOR 2
 #define LITELOADER_VERSION_MINOR 14
-#define LITELOADER_VERSION_REVISION 0
+#define LITELOADER_VERSION_REVISION 1
 #define LITELOADER_VERSION_COMMIT_SHA UNKNOWN
 #define LITELOADER_VERSION_STATUS LITELOADER_VERSION_DEV
 #define LITELOADER_VERSION_STATUS_VERSION 0

LiteLoader/include/llapi/EventAPI.h

@@ -661,13 +661,6 @@ class EntityStepOnPressurePlateEvent : public EventTemplate<EntityStepOnPressure
     BlockInstance mBlockInstance;
 };
 
-class NpcCmdEvent : public EventTemplate<NpcCmdEvent> {
-public:
-    Actor* mNpc = nullptr;
-    std::string mCommand;
-    Player* mPlayer = nullptr;
-};
-
 class ProjectileSpawnEvent : public EventTemplate<ProjectileSpawnEvent> {
 public:
     Actor* mShooter = nullptr;

LiteLoader/src/llapi/EventAPI.cpp

@@ -7,6 +7,7 @@
 #include <typeinfo>
 #include <vector>
 
+#include "llapi/mc/WeakEntityRef.hpp"
 #include "llapi/mc/ActorDamageSource.hpp"
 #include "llapi/mc/BaseCommandBlock.hpp"
 #include "llapi/mc/BedrockBlocks.hpp"
@@ -32,9 +33,7 @@
 #include "llapi/mc/PlayerActionPacket.hpp"
 #include "llapi/mc/RespawnPacket.hpp"
 #include "llapi/mc/Scoreboard.hpp"
-#include "llapi/mc/NpcSceneDialogueData.hpp"
 #include "llapi/mc/ArmorStand.hpp"
-#include "llapi/mc/NpcComponent.hpp"
 #include "llapi/mc/Container.hpp"
 #include "llapi/mc/ScoreboardId.hpp"
 #include "llapi/mc/ServerNetworkHandler.hpp"
@@ -268,7 +267,6 @@ DECLARE_EVENT_DATA(ProjectileHitEntityEvent);
 DECLARE_EVENT_DATA(WitherBossDestroyEvent);
 DECLARE_EVENT_DATA(EntityRideEvent);
 DECLARE_EVENT_DATA(EntityStepOnPressurePlateEvent);
-DECLARE_EVENT_DATA(NpcCmdEvent);
 DECLARE_EVENT_DATA(ProjectileSpawnEvent);
 DECLARE_EVENT_DATA(ProjectileCreatedEvent);
 DECLARE_EVENT_DATA(EntityTransformEvent);
@@ -1334,7 +1332,7 @@ TInstanceHook(void*, "?die@ServerPlayer@@UEAAXAEBVActorDamageSource@@@Z", Server
 #include "llapi/mc/SurvivalMode.hpp"
 
 /////////////////// PlayerDestroy ///////////////////
-TInstanceHook(bool,"?playerWillDestroy@BlockLegacy@@UEBA_NAEAVPlayer@@AEBVBlockPos@@AEBVBlock@@@Z", BlockLegacy ,Player *player, const BlockPos *pos, const Block *block){
+TInstanceHook(bool,"?playerWillDestroy@Block@@QEBA_NAEAVPlayer@@AEBVBlockPos@@@Z", Block, Player *player, const BlockPos *pos){
     if (player != nullptr && player->isPlayer()) {
         IF_LISTENED(PlayerDestroyBlockEvent) {
             PlayerDestroyBlockEvent ev{};
@@ -1346,7 +1344,7 @@ TInstanceHook(bool,"?playerWillDestroy@BlockLegacy@@UEBA_NAEAVPlayer@@AEBVBlockP
         }
         IF_LISTENED_END(PlayerDestroyBlockEvent)
         }
-        return original(this, player, pos, block);
+        return original(this, player, pos);
 }
 
 // TInstanceHook(bool, "?destroyBlock@SurvivalMode@@UEAA_NAEBVBlockPos@@E@Z", GameMode, BlockPos blockPos,
@@ -1842,40 +1840,6 @@ TClasslessInstanceHook(void, "?releaseUsing@TridentItem@@UEBAXAEAVItemStack@@PEA
     return original(this, a2, a3, a4);
 }
 
-#include "llapi/mc/WeakEntityRef.hpp"
-#include "llapi/mc/EntityContext.hpp"
-#include "llapi/mc/Npc.hpp"
-
-////////////// NpcCmd //////////////
-TInstanceHook(void,
-              "?executeCommandAction@NpcComponent@@QEAAXAEAVActor@@AEAVPlayer@@HAEBV?$basic_string@DU?$char_traits@D@"
-              "std@@V?$allocator@D@2@@std@@@Z",
-              NpcComponent, Actor* ac, Player* player, int a4, string& a5) {
-    IF_LISTENED(NpcCmdEvent) {
-        // IDA NpcComponent::executeCommandAction
-        // NpcSceneDialogueData data(*this, *ac, a5);
-
-        NpcSceneDialogueData data(WeakEntityRef(ac->getEntityContext().getWeakRef()), a5);
-
-        auto container = data.getActionsContainer();
-        if (container) {
-            auto actionAt = container->at(a4);
-            if (actionAt) {
-                if (auto* command = std::get_if<npc::CommandAction>(actionAt)) {
-                    NpcCmdEvent ev{};
-                    ev.mPlayer = player;
-                    ev.mNpc = ac;
-                    ev.mCommand = command->mActionValue.mText;
-                    if (!ev.call())
-                        return;
-                }
-            }
-        }
-    }
-    IF_LISTENED_END(NpcCmdEvent)
-    return original(this, ac, player, a4, a5);
-}
-
 ////////////// ArmorStandChange //////////////
 TInstanceHook(bool, "?_trySwapItem@ArmorStand@@AEAA_NAEAVPlayer@@W4EquipmentSlot@@@Z", ArmorStand, Player* a2, int a3) {
     IF_LISTENED(ArmorStandChangeEvent) {

RELEASE_NOTES.md

@@ -1,19 +1,14 @@
-# Release 2.14.0
+# Release 2.14.1
 
 ![BDS 1.20.0.01](https://img.shields.io/badge/BDS-1.20.0.01-blue?style=for-the-badge) ![Protocol 589](https://img.shields.io/badge/Protocol-589-orange?style=for-the-badge)
 
-## Added
-
-- Support 2.14.0 (by @dreamguxiang @OEOTYAN)
+<!-- ## Added -->
 
 ## Changed
 
-- Remove EnderDragonDestroy event
+- Remove NpcCmd event
 
 ## Fixed
 
-- Fix item disappear caused by players throwing items at unloaded chunks (by @timiya233)
-- Fix empty overloads error (by @OEOTYAN)
-- Fix destroy event (by @dofes)
-- Fix VectorBase::toString incorrect process of right parenthesis (by @Redbeanw44602)
-- Fix stop server crash caused by BDS (by @dofes)
+- Fix the original PlayerDestroy event doesn't cover the full blocks #1303 (by @dofes)
+- Fix isSimulatedPlayer in LLSE #1285 (by @OEOTYAN)

ScriptEngine/src/api/EventAPI.cpp

@@ -96,7 +96,6 @@ enum class EVENT_TYPES : int {
     onStepOnPressurePlate,
     onSpawnProjectile,
     onProjectileCreated,
-    onNpcCmd,
     onChangeArmorStand,
     onEntityTransformation,
     /* Block Events */
@@ -855,16 +854,6 @@ void EnableEventListener(int eventId) {
             });
             break;
 
-        case EVENT_TYPES::onNpcCmd:
-            Event::NpcCmdEvent::subscribe([](const NpcCmdEvent& ev) {
-                IF_LISTENED(EVENT_TYPES::onNpcCmd) {
-                    CallEvent(EVENT_TYPES::onNpcCmd, EntityClass::newEntity(ev.mNpc), PlayerClass::newPlayer(ev.mPlayer),
-                              String::newString(ev.mCommand));
-                }
-                IF_LISTENED_END(EVENT_TYPES::onNpcCmd);
-            });
-            break;
-
         case EVENT_TYPES::onSpawnProjectile:
             Event::ProjectileSpawnEvent::subscribe([](const ProjectileSpawnEvent& ev) {
                 IF_LISTENED(EVENT_TYPES::onSpawnProjectile) {

ScriptEngine/src/api/PlayerAPI.cpp

@@ -419,7 +419,7 @@ Local<Value> McClass::getPlayer(const Arguments& args) {
 
         transform(target.begin(), target.end(), target.begin(), ::tolower); // lower case the string
         auto playerList = Level::getAllPlayers();
-        int delta = 2147483647; // c++ int max
+        int delta = 2147483647;                                             // c++ int max
         Player* found = nullptr;
 
         for (Player* p : playerList) {
@@ -805,7 +805,7 @@ Local<Value> PlayerClass::getInLava() {
         if (!player)
             return Local<Value>();
 
-               return Boolean::newBoolean(ActorMobilityUtils::shouldApplyLava(
+        return Boolean::newBoolean(ActorMobilityUtils::shouldApplyLava(
             *(IConstBlockSource*)&player->getDimensionBlockSourceConst(), player->getEntityContext()));
     }
     CATCH("Fail in getInLava!")
@@ -1257,6 +1257,7 @@ Local<Value> PlayerClass::isOP(const Arguments& args) {
 }
 
 #include <llapi/mc/UpdateAbilitiesPacket.hpp>
+
 Local<Value> PlayerClass::setPermLevel(const Arguments& args) {
     CHECK_ARGS_COUNT(args, 1);
     CHECK_ARG_TYPE(args[0], ValueKind::kNumber);
@@ -2790,7 +2791,10 @@ Local<Value> PlayerClass::getBlockFromViewVector(const Arguments& args) {
 
 Local<Value> PlayerClass::isSimulatedPlayer(const Arguments& args) {
     try {
-        return Boolean::newBoolean(get()->isSimulatedPlayer());
+        Player* actor = get();
+        if (!actor)
+            return Local<Value>();
+        return Boolean::newBoolean(actor->isSimulatedPlayer());
     }
     CATCH("Fail in isSimulatedPlayer!");
 }