Merge remote-tracking branch 'origin/master' into foldermove2
Conflicts: GNUmakefile
This commit is contained in:
@@ -260,6 +260,9 @@ void cClientHandle::Authenticate(void)
|
||||
|
||||
// Send health
|
||||
m_Player->SendHealth();
|
||||
|
||||
// Send experience
|
||||
m_Player->SendExperience();
|
||||
|
||||
// Send gamemode (1.6.1 movementSpeed):
|
||||
SendGameMode(m_Player->GetGameMode());
|
||||
@@ -1873,6 +1876,15 @@ void cClientHandle::SendRespawn(void)
|
||||
|
||||
|
||||
|
||||
void cClientHandle::SendExperience(void)
|
||||
{
|
||||
m_Protocol->SendExperience();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
void cClientHandle::SendSoundEffect(const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch)
|
||||
{
|
||||
m_Protocol->SendSoundEffect(a_SoundName, a_SrcX, a_SrcY, a_SrcZ, a_Volume, a_Pitch);
|
||||
|
||||
Reference in New Issue
Block a user