1
0

Merge branch 'master' into Enchanting

This commit is contained in:
daniel0916
2014-04-16 14:31:02 +02:00
24 changed files with 696 additions and 382 deletions

View File

@@ -595,6 +595,15 @@ void cProtocol125::SendLogin(const cPlayer & a_Player, const cWorld & a_World)
void cProtocol125::SendLoginSuccess(void)
{
// Not supported in this protocol version
}
void cProtocol125::SendMapColumn(int a_ID, int a_X, int a_Y, const Byte * a_Colors, unsigned int a_Length)
{
cCSLock Lock(m_CSPacket);
@@ -643,6 +652,17 @@ void cProtocol125::SendMapDecorators(int a_ID, const cMapDecoratorList & a_Decor
void cProtocol125::SendMapInfo(int a_ID, unsigned int a_Scale)
{
// This protocol doesn't support such message
UNUSED(a_ID);
UNUSED(a_Scale);
}
void cProtocol125::SendPickupSpawn(const cPickup & a_Pickup)
{
cCSLock Lock(m_CSPacket);
@@ -684,6 +704,16 @@ void cProtocol125::SendParticleEffect(const AString & a_ParticleName, float a_Sr
void cProtocol125::SendPaintingSpawn(const cPainting & a_Painting)
{
// Not implemented in this protocol version
UNUSED(a_Painting);
}
void cProtocol125::SendPlayerListItem(const cPlayer & a_Player, bool a_IsOnline)
{
cCSLock Lock(m_CSPacket);
@@ -843,6 +873,18 @@ void cProtocol125::SendExperienceOrb(const cExpOrb & a_ExpOrb)
void cProtocol125::SendScoreboardObjective(const AString & a_Name, const AString & a_DisplayName, Byte a_Mode)
{
// This protocol version doesn't support such message
UNUSED(a_Name);
UNUSED(a_DisplayName);
UNUSED(a_Mode);
}
void cProtocol125::SendSoundEffect(const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch)
{
// Not needed in this protocol version