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

Merge remote-tracking branch 'origin/master' into foldermove2

Browse Source 
Conflicts:
	VC2008/MCServer.vcproj
This commit is contained in:
Alexander Harkness
2013-11-26 17:21:06 +00:00
parent 139bd34690 686e0c12e2
commit 0de95a215f
20 changed files with 282 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Protocol/ProtocolRecognizer.cpp
View File

@@ -476,6 +476,16 @@ void cProtocolRecognizer::SendExperience(void)
void cProtocolRecognizer::SendExperienceOrb(const cExpOrb & a_ExpOrb)
{
ASSERT(m_Protocol != NULL);
m_Protocol->SendExperienceOrb(a_ExpOrb);
}
void cProtocolRecognizer::SendSoundEffect(const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch)
{
ASSERT(m_Protocol != NULL);