Change Server::FreeInstance() to static

src/LuaPlugins/LuaPluginAPI.cpp

@@ -12,6 +12,7 @@ void LuaServer::Init(lua_State* L)
 		.addFunction("SetChatMute", &Client::SetChatMute)
 		.addFunction("GetUserType", &Client::GetUserType)
 		.addFunction("CanBuild", &Client::CanBuild)
+		.addFunction("GetName", &Client::GetName)
 		.addFunction("SetChatName", &Client::SetChatName)
 		.addFunction("GetChatName", &Client::GetChatName)
 	.endClass()
@@ -314,6 +315,21 @@ luabridge::LuaRef cmsgp_to_luatable(const struct Protocol::cmsgp clientMsg)
 	return table;
 }
 
+luabridge::LuaRef cposp_to_luatable(const struct Protocol::cposp clientPos)
+{
+	luabridge::LuaRef table(LuaPluginHandler::L);
+	table = luabridge::newTable(LuaPluginHandler::L);
+
+	table["pid"] = clientPos.pid;
+	table["x"] = clientPos.pos.x;
+	table["y"] = clientPos.pos.y;
+	table["z"] = clientPos.pos.z;
+	table["yaw"] = clientPos.yaw;
+	table["pitch"] = clientPos.pitch;
+
+	return table;
+}
+
 luabridge::LuaRef cblockp_to_luatable(const struct Protocol::cblockp clientBlock)
 {
 	luabridge::LuaRef table(LuaPluginHandler::L);

src/LuaPlugins/LuaPluginAPI.hpp

@@ -42,6 +42,7 @@ struct LuaServer {
 luabridge::LuaRef make_luatable();
 luabridge::LuaRef cauthp_to_luatable(const struct Protocol::cauthp clientAuth);
 luabridge::LuaRef cmsgp_to_luatable(const struct Protocol::cmsgp clientMsg);
+luabridge::LuaRef cposp_to_luatable(const struct Protocol::cposp clientPos);
 luabridge::LuaRef cblockp_to_luatable(const struct Protocol::cblockp clientBlock);
 
 #endif // LUAPLUGINAPI_H_

src/Main.cpp

@@ -37,7 +37,7 @@ int main()
 		}
 	}
 
-	server->FreeInstance();
+	Server::FreeInstance();
 
 	std::cout << "Exiting normally." << std::endl;
 

src/Server.cpp

@@ -306,13 +306,13 @@ void Server::OnMessage(Client* client, struct Protocol::cmsgp clientMsg)
 
 	// Chat mute check--IsChatMuted() unmutes if timer expires
 	if (client->IsChatMuted()) {
-		LOG(LogLevel::kNormal, "[Muted (%s)] %s", name.c_str(), message.c_str());
+		LOG(LogLevel::kNormal, "[MUTED (%s)] %s", name.c_str(), message.c_str());
 		return;
 	}
 
 	// Is it a command or a chat message?
 	if (message.at(0) == '/') {
-		LOG(LogLevel::kNormal, "[Command (%s)] %s", name.c_str(), message.c_str());
+		LOG(LogLevel::kNormal, "[COMMAND (%s)] %s", name.c_str(), message.c_str());
 
 		// Strip leading '/'
 		std::string command = message.substr(1);
@@ -389,7 +389,7 @@ void Server::HandlePacket(Client* client, uint8_t opcode)
 		struct Protocol::cposp clientPos;
 
 		if (clientPos.Read(stream)) {
-			auto table = make_luatable();
+			auto table = cposp_to_luatable(clientPos);
 			m_pluginHandler.TriggerEvent(EventType::kOnPosition, client, table);
 
 			if (m_pluginHandler.GetEventFlag("NoDefaultCall") <= 0)

src/Server.hpp

@@ -35,7 +35,7 @@ class Server {
 		return m_thisPtr;
 	}
 
-	void FreeInstance();
+	static void FreeInstance();
 
 	void Init();