minor cleanups

1 files changed, 5 insertions, 6 deletions

diff --git a/src/core/gameserver.cc b/src/core/gameserver.cc
index 1866ad3..afdc269 100644
--- a/src/core/gameserver.cc
+++ b/src/core/gameserver.cc
@@ -119,6 +119,9 @@ GameServer::GameServer() : GameInterface()
 		return;
 	}
 
+	// set the name of the game
+	core::Cvar::set("g_name", server_module->name().c_str(), core::Cvar::Game | core::Cvar::ReadOnly);
+
 	server_module->init();
 	if (!server_module->running()) {
 		con_error << "Could not initialize module '" << server_module->name() << "'\n";
@@ -308,12 +311,8 @@ void GameServer::kick(Player *player, std::string const &reason)
 	NetClient *client = server_network->find_client(player);
 	if (client) {
 		broadcast("^B" + player->name() + "^B has been kicked: " + reason, player);
-		send(player, "^WYou have been kicked: " + reason);
-
-		client->send("disconnect\n");
-		client->transmit(server_network->fd());
-
-		client->abort();
+		server_network->send_message(client, "info", "^WYou have been kicked: " + reason);
+		server_network->send_disconnect(client);
 	} else {
 		con_print << "Network client not found." << std::endl;
 	}