feat(scoreboard): add Server::getScoreboard

EndstoneMC · Jul 22, 2024 · fb3def7 · fb3def7
1 parent 268c781
commit fb3def7
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 3 deletions.
diff --git a/include/bedrock/world/scores/scoreboard_id.h b/include/bedrock/world/scores/scoreboard_id.h
@@ -20,8 +20,8 @@
 #include "bedrock/forward.h"
 
 class IdentityDefinition;
-class ScoreboardId {
-public:
+
+struct ScoreboardId {
     ScoreboardId() = default;
     explicit ScoreboardId(std::int64_t id) : raw_id(id) {}
     [[nodiscard]] bool isValid() const;

diff --git a/include/endstone/detail/server.h b/include/endstone/detail/server.h
@@ -72,6 +72,7 @@ class EndstoneServer : public Server {
 
     [[nodiscard]] bool isPrimaryThread() const override;
 
+    [[nodiscard]] Scoreboard *getScoreboard() const override;
     void setScoreboard(std::unique_ptr<EndstoneScoreboard> scoreboard);
     [[nodiscard]] ::ServerNetworkHandler &getServerNetworkHandler() const;
 

diff --git a/include/endstone/server.h b/include/endstone/server.h
@@ -22,6 +22,7 @@
 #include "endstone/level/level.h"
 #include "endstone/logger.h"
 #include "endstone/player.h"
+#include "endstone/scoreboard/scoreboard.h"
 #include "endstone/util/uuid.h"
 
 namespace endstone {
@@ -188,6 +189,15 @@ class Server {
      */
     [[nodiscard]] virtual bool isPrimaryThread() const = 0;
 
+    /**
+     * @brief Gets the scoreboard.
+     * <p>
+     * This will only exist after the first level has loaded.
+     *
+     * @return the scoreboard.
+     */
+    [[nodiscard]] virtual Scoreboard *getScoreboard() const = 0;
+
     /**
      * @brief Used for all administrative messages, such as an operator using a command.
      */

diff --git a/python/src/endstone/_internal/endstone_python.pyi b/python/src/endstone/_internal/endstone_python.pyi
@@ -1769,6 +1769,11 @@ class Server:
         Gets the scheduler for managing scheduled events.
         """
     @property
+    def scoreboard(self) -> Scoreboard:
+        """
+        Gets the scoreboard.
+        """
+    @property
     def version(self) -> str:
         """
         Gets the version of this server implementation.

diff --git a/src/endstone_core/server.cpp b/src/endstone_core/server.cpp
@@ -269,6 +269,11 @@ bool EndstoneServer::isPrimaryThread() const
     return Bedrock::Threading::getServerThread().isOnThread();
 }
 
+Scoreboard *EndstoneServer::getScoreboard() const
+{
+    return scoreboard_.get();
+}
+
 void EndstoneServer::setScoreboard(std::unique_ptr<EndstoneScoreboard> scoreboard)
 {
     scoreboard_ = std::move(scoreboard);

diff --git a/src/endstone_python/endstone_python.cpp b/src/endstone_python/endstone_python.cpp
@@ -232,7 +232,9 @@ void init_server(py::class_<Server> &server)
             "broadcast_message",
             [](const Server &server, const std::string &message) { server.broadcastMessage(message); },
             py::arg("message"),
-            "Broadcasts the specified message to every user with permission endstone.broadcast.user");
+            "Broadcasts the specified message to every user with permission endstone.broadcast.user")
+        .def_property_readonly("scoreboard", &Server::getScoreboard, "Gets the scoreboard.",
+                               py::return_value_policy::reference);
 }
 
 void init_player(py::module_ &m)

diff --git a/tests/plugin/test_cpp_plugin_loader.cpp b/tests/plugin/test_cpp_plugin_loader.cpp
@@ -47,6 +47,7 @@ class MockServer : public endstone::Server {
     MOCK_METHOD(void, broadcast, (const std::string &, const std::string &), (const, override));
     MOCK_METHOD(void, broadcastMessage, (const std::string &), (const, override));
     MOCK_METHOD(bool, isPrimaryThread, (), (const, override));
+    MOCK_METHOD(endstone::Scoreboard *, getScoreboard, (), (const, override));
     MockServer()
     {
         ON_CALL(*this, getLogger())

diff --git a/tests/scheduler/test_scheduler.cpp b/tests/scheduler/test_scheduler.cpp
@@ -39,6 +39,7 @@ class MockServer : public endstone::Server {
     MOCK_METHOD(void, broadcast, (const std::string &, const std::string &), (const, override));
     MOCK_METHOD(void, broadcastMessage, (const std::string &), (const, override));
     MOCK_METHOD(bool, isPrimaryThread, (), (const, override));
+    MOCK_METHOD(endstone::Scoreboard *, getScoreboard, (), (const, override));
 };
 
 class MockPlugin : public endstone::Plugin {