fix: fix NpcCmd(#1158) & Actor::isOnGround

LiteLDev · Mar 25, 2023 · 56fc851 · 56fc851
1 parent cf2b389
commit 56fc851
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/LiteLoader/include/llapi/mc/Actor.hpp b/LiteLoader/include/llapi/mc/Actor.hpp
@@ -76,7 +76,7 @@ class Actor {
     LIAPI float quickEvalMolangScript(const string& expression);
     LIAPI Biome* getBiome();
     LIAPI float getRealSpeed() const;
-    LIAPI class EntityContext* getEntityContext() const;
+    LIAPI class EntityContext& getEntityContext() const;
     //LIAPI Json::Value quickEvalMolangScriptAsJson(const string& expression);
 
     inline Vec3 getPos()
@@ -98,8 +98,7 @@ class Actor {
 
     // template<class T>
     // inline T* tryGetComponent() const {
-    //     auto* entityContext = getEntityContext();
-    //     return entityContext->_enttRegistry().try_get<T>(entityContext->_getEntityId());
+    //     return getEntityContext().tryGetComponent<T>();
     // }
 
 #undef AFTER_EXTRA

diff --git a/LiteLoader/include/llapi/mc/EntityContext.hpp b/LiteLoader/include/llapi/mc/EntityContext.hpp
@@ -20,6 +20,12 @@ class EntityContext : public EntityContextBase {
 
 #define AFTER_EXTRA
 // Add Member There
+public:
+    template <class T>
+    inline T* tryGetComponent() const {
+        return const_cast<T*>(_enttRegistry().try_get<T>(_getEntityId()));
+    }
+
 #define DISABLE_CONSTRUCTOR_PREVENTION_ENTITYCONTEXT
 #undef AFTER_EXTRA
 #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ENTITYCONTEXT

diff --git a/LiteLoader/src/llapi/EventAPI.cpp b/LiteLoader/src/llapi/EventAPI.cpp
@@ -1843,7 +1843,7 @@ TInstanceHook(void,
         // IDA NpcComponent::executeCommandAction
         // NpcSceneDialogueData data(*this, *ac, a5);
 
-        NpcSceneDialogueData data(WeakEntityRef(ac->getEntityContext()->getWeakRef()), a5);
+        NpcSceneDialogueData data(WeakEntityRef(ac->getEntityContext().getWeakRef()), a5);
 
         auto container = data.getActionsContainer();
         auto actionAt = container->getActionAt(a4);

diff --git a/LiteLoader/src/llapi/mc/ActorAPI.cpp b/LiteLoader/src/llapi/mc/ActorAPI.cpp
@@ -33,8 +33,8 @@
 
 class UserEntityIdentifierComponent;
 
-EntityContext* Actor::getEntityContext() const {
-    return dAccess<EntityContext*, 8>((Actor*)this);
+class EntityContext& Actor::getEntityContext() const {
+    return dAccess<EntityContext, 8>((Actor*)this);
 }
 
 class UserEntityIdentifierComponent;
@@ -82,7 +82,7 @@ bool Actor::isItemActor() const {
 #include "llapi/mc/ActorCollision.hpp"
 
 bool Actor::isOnGround() const {
-    return ActorCollision::isOnGround(*getEntityContext()); // IDA DirectActorProxyImpl<IMobMovementProxy>::isOnGround
+    return ActorCollision::isOnGround(getEntityContext()); // IDA DirectActorProxyImpl<IMobMovementProxy>::isOnGround
 }
 
 std::string Actor::getTypeName() const {