summaryrefslogtreecommitdiffstats
path: root/src/World.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-09-26 23:01:22 +0200
committerMattes D <github@xoft.cz>2014-09-26 23:01:22 +0200
commit305778f22f00384a7e4228990971e50240040acf (patch)
treed485462b555c767a13dec9ad0c35d20597546490 /src/World.cpp
parentFixed UNUSED macro so that it doesn't require type knowledge. (diff)
parentMerge branch 'master' into Fixes (diff)
downloadcuberite-305778f22f00384a7e4228990971e50240040acf.tar
cuberite-305778f22f00384a7e4228990971e50240040acf.tar.gz
cuberite-305778f22f00384a7e4228990971e50240040acf.tar.bz2
cuberite-305778f22f00384a7e4228990971e50240040acf.tar.lz
cuberite-305778f22f00384a7e4228990971e50240040acf.tar.xz
cuberite-305778f22f00384a7e4228990971e50240040acf.tar.zst
cuberite-305778f22f00384a7e4228990971e50240040acf.zip
Diffstat (limited to 'src/World.cpp')
-rw-r--r--src/World.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/World.cpp b/src/World.cpp
index cd23ff191..61c061867 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -2236,7 +2236,7 @@ void cWorld::BroadcastPlayerListUpdatePing(const cPlayer & a_Player, const cClie
-void cWorld::BroadcastPlayerListUpdateDisplayName(const cPlayer & a_Player, const AString & a_OldListName, const cClientHandle * a_Exclude)
+void cWorld::BroadcastPlayerListUpdateDisplayName(const cPlayer & a_Player, const AString & a_CustomName, const cClientHandle * a_Exclude)
{
cCSLock Lock(m_CSPlayers);
for (cPlayerList::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
@@ -2246,7 +2246,7 @@ void cWorld::BroadcastPlayerListUpdateDisplayName(const cPlayer & a_Player, cons
{
continue;
}
- ch->SendPlayerListUpdateDisplayName(a_Player, a_OldListName);
+ ch->SendPlayerListUpdateDisplayName(a_Player, a_CustomName);
}
}