summaryrefslogtreecommitdiffstats
path: root/source/Protocol
diff options
context:
space:
mode:
authorDaniel O'Brien <marmot.daniel@gmail.com>2013-11-15 16:23:50 +0100
committerDaniel O'Brien <marmot.daniel@gmail.com>2013-11-15 16:23:50 +0100
commit04dff4882a3d75f3a0d432fb3377cc3f59fdf251 (patch)
treefca7853f6f6e69cc3e1b75b958ced35ba82712fa /source/Protocol
parentMerge remote-tracking branch 'upstream/master' into playerxp (diff)
downloadcuberite-04dff4882a3d75f3a0d432fb3377cc3f59fdf251.tar
cuberite-04dff4882a3d75f3a0d432fb3377cc3f59fdf251.tar.gz
cuberite-04dff4882a3d75f3a0d432fb3377cc3f59fdf251.tar.bz2
cuberite-04dff4882a3d75f3a0d432fb3377cc3f59fdf251.tar.lz
cuberite-04dff4882a3d75f3a0d432fb3377cc3f59fdf251.tar.xz
cuberite-04dff4882a3d75f3a0d432fb3377cc3f59fdf251.tar.zst
cuberite-04dff4882a3d75f3a0d432fb3377cc3f59fdf251.zip
Diffstat (limited to 'source/Protocol')
-rw-r--r--source/Protocol/Protocol.h2
-rw-r--r--source/Protocol/Protocol125.cpp2
-rw-r--r--source/Protocol/Protocol125.h2
-rw-r--r--source/Protocol/Protocol17x.cpp2
-rw-r--r--source/Protocol/Protocol17x.h2
-rw-r--r--source/Protocol/ProtocolRecognizer.cpp4
-rw-r--r--source/Protocol/ProtocolRecognizer.h2
7 files changed, 8 insertions, 8 deletions
diff --git a/source/Protocol/Protocol.h b/source/Protocol/Protocol.h
index c00c3cad4..98eeec789 100644
--- a/source/Protocol/Protocol.h
+++ b/source/Protocol/Protocol.h
@@ -85,7 +85,7 @@ public:
virtual void SendPlayerPosition (void) = 0;
virtual void SendPlayerSpawn (const cPlayer & a_Player) = 0;
virtual void SendRespawn (void) = 0;
- virtual void SendSetExperience (void) = 0;
+ virtual void SendExperience (void) = 0;
virtual void SendSoundEffect (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch) = 0; // a_Src coords are Block * 8
virtual void SendSoundParticleEffect (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) = 0;
virtual void SendSpawnFallingBlock (const cFallingBlock & a_FallingBlock) = 0;
diff --git a/source/Protocol/Protocol125.cpp b/source/Protocol/Protocol125.cpp
index 08a2b8656..c2dc1c9ce 100644
--- a/source/Protocol/Protocol125.cpp
+++ b/source/Protocol/Protocol125.cpp
@@ -691,7 +691,7 @@ void cProtocol125::SendRespawn(void)
-void cProtocol125::SendSetExperience(void)
+void cProtocol125::SendExperience(void)
{
cCSLock Lock(m_CSPacket);
WriteByte (PACKET_EXPERIENCE);
diff --git a/source/Protocol/Protocol125.h b/source/Protocol/Protocol125.h
index 48309a961..cd208eaba 100644
--- a/source/Protocol/Protocol125.h
+++ b/source/Protocol/Protocol125.h
@@ -62,7 +62,7 @@ public:
virtual void SendPlayerPosition (void) override;
virtual void SendPlayerSpawn (const cPlayer & a_Player) override;
virtual void SendRespawn (void) override;
- virtual void SendSetExperience (void) override;
+ virtual void SendExperience (void) override;
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
virtual void SendSoundParticleEffect (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) override;
virtual void SendSpawnFallingBlock (const cFallingBlock & a_FallingBlock) override;
diff --git a/source/Protocol/Protocol17x.cpp b/source/Protocol/Protocol17x.cpp
index b14c52cba..7ff2b54b1 100644
--- a/source/Protocol/Protocol17x.cpp
+++ b/source/Protocol/Protocol17x.cpp
@@ -597,7 +597,7 @@ void cProtocol172::SendRespawn(void)
-void cProtocol172::SendSetExperience (void)
+void cProtocol172::SendExperience (void)
{
cPacketizer Pkt(*this, 0x1F); //Experience Packet
Pkt.WriteFloat(m_Client->GetPlayer()->XpGetPercentage());
diff --git a/source/Protocol/Protocol17x.h b/source/Protocol/Protocol17x.h
index 99ae3a087..6e8574d98 100644
--- a/source/Protocol/Protocol17x.h
+++ b/source/Protocol/Protocol17x.h
@@ -72,7 +72,7 @@ public:
virtual void SendPlayerSpawn (const cPlayer & a_Player) override;
virtual void SendRespawn (void) override;
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
- virtual void SendSetExperience (void) override;
+ virtual void SendExperience (void) override;
virtual void SendSoundParticleEffect (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) override;
virtual void SendSpawnFallingBlock (const cFallingBlock & a_FallingBlock) override;
virtual void SendSpawnMob (const cMonster & a_Mob) override;
diff --git a/source/Protocol/ProtocolRecognizer.cpp b/source/Protocol/ProtocolRecognizer.cpp
index 283c20811..64bd83075 100644
--- a/source/Protocol/ProtocolRecognizer.cpp
+++ b/source/Protocol/ProtocolRecognizer.cpp
@@ -466,10 +466,10 @@ void cProtocolRecognizer::SendRespawn(void)
-void cProtocolRecognizer::SendSetExperience(void)
+void cProtocolRecognizer::SendExperience(void)
{
ASSERT(m_Protocol != NULL);
- m_Protocol->SendSetExperience();
+ m_Protocol->SendExperience();
}
diff --git a/source/Protocol/ProtocolRecognizer.h b/source/Protocol/ProtocolRecognizer.h
index a32772282..c2beb2014 100644
--- a/source/Protocol/ProtocolRecognizer.h
+++ b/source/Protocol/ProtocolRecognizer.h
@@ -97,7 +97,7 @@ public:
virtual void SendPlayerPosition (void) override;
virtual void SendPlayerSpawn (const cPlayer & a_Player) override;
virtual void SendRespawn (void) override;
- virtual void SendSetExperience (void) override;
+ virtual void SendExperience (void) override;
virtual void SendSoundEffect (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch) override;
virtual void SendSoundParticleEffect (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) override;
virtual void SendSpawnFallingBlock (const cFallingBlock & a_FallingBlock) override;