refactor: move getAttribute from Player to Actor

EndstoneMC · Jun 18, 2024 · ed5fbc8 · ed5fbc8
1 parent c1e33ac
commit ed5fbc8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/include/bedrock/world/actor/actor.h b/include/bedrock/world/actor/actor.h
@@ -269,6 +269,7 @@ class Actor {
     [[nodiscard]] bool isRiding() const;
     [[nodiscard]] bool hasCategory(ActorCategory) const;
     [[nodiscard]] bool isJumping() const;
+    [[nodiscard]] const AttributeInstance &getAttribute(const Attribute &) const;
 
     static Actor *tryGetFromEntity(EntityContext const &, bool include_removed);
 

diff --git a/include/bedrock/world/actor/player/player.h b/include/bedrock/world/actor/player/player.h
@@ -128,7 +128,6 @@ class Player : public Mob {
     [[nodiscard]] bool isEmoting() const;
     [[nodiscard]] bool isFlying() const;
     // Attributes
-    [[nodiscard]] const AttributeInstance &getAttribute(const Attribute &) const;
     [[nodiscard]] int getPlayerLevel() const;
     [[nodiscard]] float getLevelProgress() const;
 

diff --git a/include/bedrock/world/attribute/base_attribute_map.h b/include/bedrock/world/attribute/base_attribute_map.h
@@ -39,6 +39,6 @@ class BaseAttributeMap {
 
 private:
     std::unordered_map<std::uint32_t, AttributeInstance> instance_map_;  // +0
-    std::vector<void *> dirty_attributes_;  //+64 (+56) std::vector<AttributeInstanceHandle>
+    std::vector<void *> dirty_attributes_;  //+64 (+40) std::vector<AttributeInstanceHandle>
 };
-BEDROCK_STATIC_ASSERT_SIZE(BaseAttributeMap, 88, 80);
+BEDROCK_STATIC_ASSERT_SIZE(BaseAttributeMap, 88, 64);
diff --git a/src/endstone_runtime/bedrock/world/actor/actor.cpp b/src/endstone_runtime/bedrock/world/actor/actor.cpp
@@ -178,3 +178,9 @@ bool Actor::isJumping() const
 {
     return MobJump::isJumping(entity_context_);
 }
+
+const AttributeInstance &Actor::getAttribute(const Attribute &attribute) const
+{
+    auto component = getPersistentComponent<AttributesComponent>();
+    return component->attributes.getInstance(attribute);
+}
diff --git a/src/endstone_runtime/bedrock/world/actor/player/player.cpp b/src/endstone_runtime/bedrock/world/actor/player/player.cpp
@@ -81,12 +81,6 @@ bool Player::isFlying() const
     return getAbilities().getBool(AbilitiesIndex::Flying);
 }
 
-const AttributeInstance &Player::getAttribute(const Attribute &attribute) const
-{
-    auto component = getPersistentComponent<AttributesComponent>();
-    return component->attributes.getInstance(attribute);
-}
-
 int Player::getPlayerLevel() const
 {
     static Attribute *level = AttributeCollection::getAttribute("minecraft:player.level");