minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove "Server -!- " prefix from player messages

This commit is contained in:
ShadowNinja 2014-02-24 20:41:40 -05:00
parent 18fd913e69
commit 9a3b7715e2
5 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/chatcommands.lua
View File

@ -710,7 +710,7 @@ minetest.register_chatcommand("msg", {
if found then if found then
if minetest.get_player_by_name(sendto) then if minetest.get_player_by_name(sendto) then
minetest.log("action", "PM from "..name.." to "..sendto..": "..message) minetest.log("action", "PM from "..name.." to "..sendto..": "..message)
minetest.chat_send_player(sendto, "PM from "..name..": "..message, false) minetest.chat_send_player(sendto, "PM from "..name..": "..message)
minetest.chat_send_player(name, "Message sent") minetest.chat_send_player(name, "Message sent")
else else
minetest.chat_send_player(name, "The player "..sendto.." is not online") minetest.chat_send_player(name, "The player "..sendto.." is not online")

3
doc/lua_api.txt
View File

@ -1327,8 +1327,7 @@ minetest.get_player_ip(name) -> IP address string
Chat: Chat:
minetest.chat_send_all(text) minetest.chat_send_all(text)
minetest.chat_send_player(name, text, prepend) minetest.chat_send_player(name, text)
^ prepend: optional, if it is set to false "Server -!- " will not be prepended to the message
Environment access: Environment access:

8
src/script/lua_api/l_server.cpp
View File

@ -52,21 +52,17 @@ int ModApiServer::l_chat_send_all(lua_State *L)
return 0; return 0;
} }
// chat_send_player(name, text, prepend) // chat_send_player(name, text)
int ModApiServer::l_chat_send_player(lua_State *L) int ModApiServer::l_chat_send_player(lua_State *L)
{ {
NO_MAP_LOCK_REQUIRED; NO_MAP_LOCK_REQUIRED;
const char *name = luaL_checkstring(L, 1); const char *name = luaL_checkstring(L, 1);
const char *text = luaL_checkstring(L, 2); const char *text = luaL_checkstring(L, 2);
bool prepend = true;
if (lua_isboolean(L, 3))
prepend = lua_toboolean(L, 3);
// Get server from registry // Get server from registry
Server *server = getServer(L); Server *server = getServer(L);
// Send // Send
server->notifyPlayer(name, narrow_to_wide(text), prepend); server->notifyPlayer(name, narrow_to_wide(text));
return 0; return 0;
} }

7
src/server.cpp
View File

@ -4385,7 +4385,7 @@ std::string Server::getBanDescription(const std::string &ip_or_name)
return m_banmanager->getBanDescription(ip_or_name); return m_banmanager->getBanDescription(ip_or_name);
} }
void Server::notifyPlayer(const char *name, const std::wstring msg, const bool prepend = true) void Server::notifyPlayer(const char *name, const std::wstring msg)
{ {
Player *player = m_env->getPlayer(name); Player *player = m_env->getPlayer(name);
if(!player) if(!player)
@ -4394,10 +4394,7 @@ void Server::notifyPlayer(const char *name, const std::wstring msg, const bool p
if (player->peer_id == PEER_ID_INEXISTENT) if (player->peer_id == PEER_ID_INEXISTENT)
return; return;
if (prepend) SendChatMessage(player->peer_id, msg);
SendChatMessage(player->peer_id, std::wstring(L"Server -!- ")+msg);
else
SendChatMessage(player->peer_id, msg);
} }
bool Server::showFormspec(const char *playername, const std::string &formspec, const std::string &formname) bool Server::showFormspec(const char *playername, const std::string &formspec, const std::string &formname)

2
src/server.h
View File

@ -229,7 +229,7 @@ public:
void unsetIpBanned(const std::string &ip_or_name); void unsetIpBanned(const std::string &ip_or_name);
std::string getBanDescription(const std::string &ip_or_name); std::string getBanDescription(const std::string &ip_or_name);
void notifyPlayer(const char *name, const std::wstring msg, const bool prepend); void notifyPlayer(const char *name, const std::wstring msg);
void notifyPlayers(const std::wstring msg); void notifyPlayers(const std::wstring msg);
void spawnParticle(const char *playername, void spawnParticle(const char *playername,
v3f pos, v3f velocity, v3f acceleration, v3f pos, v3f velocity, v3f acceleration,