refactor: Player now inherits directly from Actor

EndstoneMC · May 22, 2024 · 69f8d35 · 69f8d35
1 parent 13f2733
commit 69f8d35
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 269 deletions.
diff --git a/include/endstone/actor/human.h b/include/endstone/actor/human.h
diff --git a/include/endstone/detail/actor/human.h b/include/endstone/detail/actor/human.h
diff --git a/include/endstone/detail/player.h b/include/endstone/detail/player.h
@@ -14,15 +14,15 @@
 
 #pragma once
 
-#include "endstone/detail/actor/human.h"
+#include "endstone/detail/actor/actor.h"
 #include "endstone/player.h"
 
 class Player;
 class ServerNetworkHandler;
 
 namespace endstone::detail {
 
-class EndstonePlayer : public EndstoneHumanActor, public endstone::Player {
+class EndstonePlayer : public EndstoneActor, public endstone::Player {
 public:
     explicit EndstonePlayer(EndstoneServer &server, ::Player &player);
     ~EndstonePlayer() override;
@@ -54,6 +54,7 @@ class EndstonePlayer : public EndstoneHumanActor, public endstone::Player {
     [[nodiscard]] bool isInWater() const override;
     [[nodiscard]] bool isInLava() const override;
     [[nodiscard]] Level &getLevel() const override;
+    [[nodiscard]] Dimension &getDimension() const override;
 
     // Player
     [[nodiscard]] UUID getUniqueId() const override;
@@ -74,6 +75,7 @@ class EndstonePlayer : public EndstoneHumanActor, public endstone::Player {
     ::ServerNetworkHandler *network_handler_;
     UUID uuid_;
     SocketAddress address_;
+    PermissibleBase perm_;
 };
 
 }  // namespace endstone::detail
diff --git a/include/endstone/player.h b/include/endstone/player.h
@@ -16,7 +16,7 @@
 
 #include <chrono>
 
-#include "endstone/actor/human.h"
+#include "endstone/actor/actor.h"
 #include "endstone/util/socket_address.h"
 #include "endstone/util/uuid.h"
 
@@ -25,7 +25,7 @@ namespace endstone {
 /**
  * @brief Represents a player.
  */
-class Player : public HumanActor {
+class Player : public Actor {
 public:
     Player() = default;
     Player(const Player &) = delete;

diff --git a/src/endstone_core/actor/human.cpp b/src/endstone_core/actor/human.cpp