flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Manual merge (Fixed conflicts)

Browse Source
This commit is contained in:
andrew
2014-02-20 15:37:15 +02:00
parent 58a708825f 7b8ff7c986
commit 83d3a2eedf
106 changed files with 4207 additions and 688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Protocol/ProtocolRecognizer.cpp
View File

@@ -159,6 +159,16 @@ void cProtocolRecognizer::SendChat(const AString & a_Message)
void cProtocolRecognizer::SendChat(const cCompositeChat & a_Message)
{
ASSERT(m_Protocol != NULL);
m_Protocol->SendChat(a_Message);
}
void cProtocolRecognizer::SendChunkData(int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer)
{
ASSERT(m_Protocol != NULL);
@@ -425,6 +435,14 @@ void cProtocolRecognizer::SendParticleEffect(const AString & a_ParticleName, flo
void cProtocolRecognizer::SendPaintingSpawn(const cPainting & a_Painting)
{
m_Protocol->SendPaintingSpawn(a_Painting);
}
void cProtocolRecognizer::SendPickupSpawn(const cPickup & a_Pickup)
{