fix: get player by uuid no longer crashes

EndstoneMC · Jun 15, 2024 · 38a7ec2 · 38a7ec2
1 parent da1707f
commit 38a7ec2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/include/endstone/detail/pybind_type_caster.h b/include/endstone/detail/pybind_type_caster.h
@@ -39,7 +39,7 @@ struct type_caster<endstone::UUID> {
         }
 
         /* Now try to convert into C++ object */
-        PyObject *bytes = PyObject_CallMethod(source, "bytes", NULL);
+        PyObject *bytes = PyObject_GetAttrString(source, "bytes");
         if (PyBytes_GET_SIZE(bytes) != 16) {
             PyErr_SetString(PyExc_ValueError, "UUID bytes size must be 16");
             Py_XDECREF(bytes);
@@ -57,7 +57,7 @@ struct type_caster<endstone::UUID> {
         Py_XDECREF(bytes);
         Py_XDECREF(uuid_module);
         Py_XDECREF(uuid_class);
-        return PyErr_Occurred() != nullptr;
+        return PyErr_Occurred() == nullptr;
     }
 
     // C++ -> Python

diff --git a/src/endstone_python/endstone_python.cpp b/src/endstone_python/endstone_python.cpp
@@ -201,7 +201,7 @@ void init_server(py::class_<Server> &server)
                                "Gets a list of all currently online players.")
         .def_property("max_players", &Server::getMaxPlayers, &Server::setMaxPlayers,
                       "The maximum amount of players which can login to this server.")
-        .def("get_player", py::overload_cast<std::string>(&Server::getPlayer, py::const_), py::arg("name"),
+        .def("get_player", py::overload_cast<std::string>(&Server::getPlayer, py::const_), py::arg("name").noconvert(),
              py::return_value_policy::reference, "Gets the player with the exact given name, case insensitive.")
         .def("get_player", py::overload_cast<endstone::UUID>(&Server::getPlayer, py::const_),
              py::arg("unique_id").noconvert(), py::return_value_policy::reference,