summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorDaniel O'Brien <marmot.daniel@gmail.com>2013-11-15 16:32:04 +0100
committerDaniel O'Brien <marmot.daniel@gmail.com>2013-11-15 16:32:04 +0100
commita94a6d48a0d6121c6951f01a81474e718f045430 (patch)
treefb5132ca22cb1e0fee41d16fa5fd9f1b418eb4b1 /source
parentfinished #143 I believe (diff)
downloadcuberite-a94a6d48a0d6121c6951f01a81474e718f045430.tar
cuberite-a94a6d48a0d6121c6951f01a81474e718f045430.tar.gz
cuberite-a94a6d48a0d6121c6951f01a81474e718f045430.tar.bz2
cuberite-a94a6d48a0d6121c6951f01a81474e718f045430.tar.lz
cuberite-a94a6d48a0d6121c6951f01a81474e718f045430.tar.xz
cuberite-a94a6d48a0d6121c6951f01a81474e718f045430.tar.zst
cuberite-a94a6d48a0d6121c6951f01a81474e718f045430.zip
Diffstat (limited to '')
-rw-r--r--source/ClientHandle.h2
-rw-r--r--source/Entities/Player.cpp2
-rw-r--r--source/Protocol/Protocol.h2
-rw-r--r--source/Protocol/Protocol125.h2
-rw-r--r--source/Protocol/Protocol17x.h2
-rw-r--r--source/Protocol/ProtocolRecognizer.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/source/ClientHandle.h b/source/ClientHandle.h
index d3e257aee..b887bb11a 100644
--- a/source/ClientHandle.h
+++ b/source/ClientHandle.h
@@ -120,7 +120,7 @@ public:
void SendPlayerPosition (void);
void SendPlayerSpawn (const cPlayer & a_Player);
void SendRespawn (void);
- void SendExperience (void);
+ void SendExperience (void);
void SendSoundEffect (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch); // a_Src coords are Block * 8
void SendSoundParticleEffect (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data);
void SendSpawnFallingBlock (const cFallingBlock & a_FallingBlock);
diff --git a/source/Entities/Player.cpp b/source/Entities/Player.cpp
index 651a0b2a6..f25483375 100644
--- a/source/Entities/Player.cpp
+++ b/source/Entities/Player.cpp
@@ -1437,7 +1437,7 @@ bool cPlayer::LoadFromDisk()
m_FoodSaturationLevel = root.get("foodSaturation", MAX_FOOD_LEVEL).asDouble();
m_FoodTickTimer = root.get("foodTickTimer", 0).asInt();
m_FoodExhaustionLevel = root.get("foodExhaustion", 0).asDouble();
- m_XpTotal = root.get("experience", 0).asInt();
+ m_XpTotal = (short) root.get("experience", 0).asInt();
//SetExperience(root.get("experience", 0).asInt());
diff --git a/source/Protocol/Protocol.h b/source/Protocol/Protocol.h
index 98eeec789..542060ece 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 SendExperience (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.h b/source/Protocol/Protocol125.h
index cd208eaba..c5f44c818 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 SendExperience (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.h b/source/Protocol/Protocol17x.h
index 6e8574d98..e3f2ad922 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 SendExperience (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.h b/source/Protocol/ProtocolRecognizer.h
index c2beb2014..03f48fb35 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 SendExperience (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;