summaryrefslogtreecommitdiffstats
path: root/src/Protocol/Protocol17x.cpp
diff options
context:
space:
mode:
authorandrew <xdotftw@gmail.com>2014-05-11 13:57:06 +0200
committerandrew <xdotftw@gmail.com>2014-05-11 13:57:06 +0200
commitc7c3724a3ee0e7a77fe9924ad25c36b6ec8fdd14 (patch)
treee26a406f738328936caf2a0b361ff5745510d113 /src/Protocol/Protocol17x.cpp
parentMerge pull request #992 from mc-server/coverity_fixes (diff)
downloadcuberite-c7c3724a3ee0e7a77fe9924ad25c36b6ec8fdd14.tar
cuberite-c7c3724a3ee0e7a77fe9924ad25c36b6ec8fdd14.tar.gz
cuberite-c7c3724a3ee0e7a77fe9924ad25c36b6ec8fdd14.tar.bz2
cuberite-c7c3724a3ee0e7a77fe9924ad25c36b6ec8fdd14.tar.lz
cuberite-c7c3724a3ee0e7a77fe9924ad25c36b6ec8fdd14.tar.xz
cuberite-c7c3724a3ee0e7a77fe9924ad25c36b6ec8fdd14.tar.zst
cuberite-c7c3724a3ee0e7a77fe9924ad25c36b6ec8fdd14.zip
Diffstat (limited to '')
-rw-r--r--src/Protocol/Protocol17x.cpp48
1 files changed, 41 insertions, 7 deletions
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp
index 443723e40..3b21f7821 100644
--- a/src/Protocol/Protocol17x.cpp
+++ b/src/Protocol/Protocol17x.cpp
@@ -11,13 +11,19 @@ Implements the 1.7.x protocol classes:
#include "json/json.h"
#include "Protocol17x.h"
#include "ChunkDataSerializer.h"
+#include "PolarSSL++/Sha1Checksum.h"
+
#include "../ClientHandle.h"
#include "../Root.h"
#include "../Server.h"
#include "../World.h"
+#include "../StringCompression.h"
+#include "../CompositeChat.h"
+#include "../Statistics.h"
+
#include "../WorldStorage/FastNBT.h"
#include "../WorldStorage/EnchantmentSerializer.h"
-#include "../StringCompression.h"
+
#include "../Entities/ExpOrb.h"
#include "../Entities/Minecart.h"
#include "../Entities/FallingBlock.h"
@@ -25,15 +31,15 @@ Implements the 1.7.x protocol classes:
#include "../Entities/Pickup.h"
#include "../Entities/Player.h"
#include "../Entities/ItemFrame.h"
+#include "../Entities/ArrowEntity.h"
+#include "../Entities/FireworkEntity.h"
+
#include "../Mobs/IncludeAllMonsters.h"
#include "../UI/Window.h"
+
#include "../BlockEntities/CommandBlockEntity.h"
#include "../BlockEntities/MobHeadEntity.h"
#include "../BlockEntities/FlowerPotEntity.h"
-#include "../CompositeChat.h"
-#include "../Entities/ArrowEntity.h"
-#include "../Entities/FireworkEntity.h"
-#include "PolarSSL++/Sha1Checksum.h"
@@ -1169,6 +1175,28 @@ void cProtocol172::SendSpawnVehicle(const cEntity & a_Vehicle, char a_VehicleTyp
+void cProtocol172::SendStatistics(const cStatManager & a_Manager)
+{
+ ASSERT(m_State == 3); // In game mode?
+
+ cPacketizer Pkt(*this, 0x37);
+ Pkt.WriteVarInt(statCount); // TODO 2014-05-11 xdot: Optimization: Send "dirty" statistics only
+
+ for (unsigned int i = 0; i < (unsigned int)statCount; ++i)
+ {
+ StatValue Value = a_Manager.GetValue((eStatistic) i);
+
+ const AString & StatName = cStatInfo::GetName((eStatistic) i);
+
+ Pkt.WriteString(StatName);
+ Pkt.WriteVarInt(Value);
+ }
+}
+
+
+
+
+
void cProtocol172::SendTabCompletionResults(const AStringVector & a_Results)
{
ASSERT(m_State == 3); // In game mode?
@@ -1843,13 +1871,19 @@ void cProtocol172::HandlePacketClientStatus(cByteBuffer & a_ByteBuffer)
case 1:
{
// Request stats
- // TODO
+ const cStatManager & Manager = m_Client->GetPlayer()->GetStatManager();
+ SendStatistics(Manager);
+
break;
}
case 2:
{
// Open Inventory achievement
- // TODO
+ cStatManager & Manager = m_Client->GetPlayer()->GetStatManager();
+ Manager.AddValue(achOpenInv);
+
+ SendStatistics(Manager);
+
break;
}
}