summaryrefslogtreecommitdiffstats
path: root/src/Protocol/Protocol17x.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/Protocol/Protocol17x.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/Protocol/Protocol17x.cpp')
-rw-r--r--src/Protocol/Protocol17x.cpp20
1 files changed, 4 insertions, 16 deletions
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp
index 36a808afe..ac58ef28b 100644
--- a/src/Protocol/Protocol17x.cpp
+++ b/src/Protocol/Protocol17x.cpp
@@ -838,23 +838,11 @@ void cProtocol172::SendPlayerListUpdatePing(const cPlayer & a_Player)
-void cProtocol172::SendPlayerListUpdateDisplayName(const cPlayer & a_Player, const AString & a_OldListName)
+void cProtocol172::SendPlayerListUpdateDisplayName(const cPlayer & a_Player, const AString & a_CustomName)
{
- ASSERT(m_State == 3); // In game mode?
- if (a_OldListName == a_Player.GetPlayerListName())
- {
- return;
- }
-
- // Remove the old name from the tablist:
- {
- cPacketizer Pkt(*this, 0x38);
- Pkt.WriteString(a_OldListName);
- Pkt.WriteBool(false);
- Pkt.WriteShort(0);
- }
-
- SendPlayerListAddPlayer(a_Player);
+ // Not implemented in this protocol version
+ UNUSED(a_Player);
+ UNUSED(a_CustomName);
}