summaryrefslogtreecommitdiffstats
path: root/src/Protocol/Protocol125.h
diff options
context:
space:
mode:
authordaniel0916 <theschokolps@gmail.com>2014-04-16 14:31:02 +0200
committerdaniel0916 <theschokolps@gmail.com>2014-04-16 14:31:02 +0200
commit5a9acb7eb6eef293dc53cfe916c74f5cfa069db4 (patch)
tree8e0b29c5f0240ac0961e69b905921243130d0258 /src/Protocol/Protocol125.h
parentFixed merge conflict (diff)
parentAttempted fix for the client crash with the new protocols. (diff)
downloadcuberite-5a9acb7eb6eef293dc53cfe916c74f5cfa069db4.tar
cuberite-5a9acb7eb6eef293dc53cfe916c74f5cfa069db4.tar.gz
cuberite-5a9acb7eb6eef293dc53cfe916c74f5cfa069db4.tar.bz2
cuberite-5a9acb7eb6eef293dc53cfe916c74f5cfa069db4.tar.lz
cuberite-5a9acb7eb6eef293dc53cfe916c74f5cfa069db4.tar.xz
cuberite-5a9acb7eb6eef293dc53cfe916c74f5cfa069db4.tar.zst
cuberite-5a9acb7eb6eef293dc53cfe916c74f5cfa069db4.zip
Diffstat (limited to 'src/Protocol/Protocol125.h')
-rw-r--r--src/Protocol/Protocol125.h20
1 files changed, 4 insertions, 16 deletions
diff --git a/src/Protocol/Protocol125.h b/src/Protocol/Protocol125.h
index 753458ebc..89e64f386 100644
--- a/src/Protocol/Protocol125.h
+++ b/src/Protocol/Protocol125.h
@@ -56,19 +56,12 @@ public:
virtual void SendInventorySlot (char a_WindowID, short a_SlotNum, const cItem & a_Item) override;
virtual void SendKeepAlive (int a_PingID) override;
virtual void SendLogin (const cPlayer & a_Player, const cWorld & a_World) override;
+ virtual void SendLoginSuccess (void) override;
virtual void SendMapColumn (int a_ID, int a_X, int a_Y, const Byte * a_Colors, unsigned int a_Length) override;
virtual void SendMapDecorators (int a_ID, const cMapDecoratorList & a_Decorators) override;
- virtual void SendMapInfo (int a_ID, unsigned int a_Scale) override
- {
- // This protocol doesn't support such message
- UNUSED(a_ID);
- UNUSED(a_Scale);
- }
+ virtual void SendMapInfo (int a_ID, unsigned int a_Scale) override;
virtual void SendParticleEffect (const AString & a_ParticleName, float a_SrcX, float a_SrcY, float a_SrcZ, float a_OffsetX, float a_OffsetY, float a_OffsetZ, float a_ParticleData, int a_ParticleAmmount) override;
- virtual void SendPaintingSpawn (const cPainting & a_Painting) override
- {
- UNUSED(a_Painting);
- };
+ virtual void SendPaintingSpawn (const cPainting & a_Painting) override;
virtual void SendPickupSpawn (const cPickup & a_Pickup) override;
virtual void SendPlayerAbilities (void) override {} // This protocol doesn't support such message
virtual void SendEntityAnimation (const cEntity & a_Entity, char a_Animation) override;
@@ -82,12 +75,7 @@ public:
virtual void SendRespawn (void) override;
virtual void SendExperience (void) override;
virtual void SendExperienceOrb (const cExpOrb & a_ExpOrb) override;
- virtual void SendScoreboardObjective (const AString & a_Name, const AString & a_DisplayName, Byte a_Mode) override
- {
- UNUSED(a_Name);
- UNUSED(a_DisplayName);
- UNUSED(a_Mode);
- } // This protocol doesn't support such message
+ virtual void SendScoreboardObjective (const AString & a_Name, const AString & a_DisplayName, Byte a_Mode) override;
virtual void SendScoreUpdate (const AString & a_Objective, const AString & a_Player, cObjective::Score a_Score, Byte a_Mode) override {} // This protocol doesn't support such message
virtual void SendDisplayObjective (const AString & a_Objective, cScoreboard::eDisplaySlot a_Display) override {} // This protocol doesn't support such message
virtual void SendSoundEffect (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch) override; // a_Src coords are Block * 8