summaryrefslogtreecommitdiffstats
path: root/Tools/ProtoProxy/Connection.cpp
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-04-14 18:50:44 +0200
committermadmaxoft <github@xoft.cz>2014-04-14 18:50:44 +0200
commit21e569081148c098c043cc2665b8384cceb5e3d5 (patch)
tree916b33303b0056cb539d88b040d3a2a7fd306c19 /Tools/ProtoProxy/Connection.cpp
parentProtoProxy: Added 1.7.9 compatibility. (diff)
downloadcuberite-21e569081148c098c043cc2665b8384cceb5e3d5.tar
cuberite-21e569081148c098c043cc2665b8384cceb5e3d5.tar.gz
cuberite-21e569081148c098c043cc2665b8384cceb5e3d5.tar.bz2
cuberite-21e569081148c098c043cc2665b8384cceb5e3d5.tar.lz
cuberite-21e569081148c098c043cc2665b8384cceb5e3d5.tar.xz
cuberite-21e569081148c098c043cc2665b8384cceb5e3d5.tar.zst
cuberite-21e569081148c098c043cc2665b8384cceb5e3d5.zip
Diffstat (limited to 'Tools/ProtoProxy/Connection.cpp')
-rw-r--r--Tools/ProtoProxy/Connection.cpp38
1 files changed, 22 insertions, 16 deletions
diff --git a/Tools/ProtoProxy/Connection.cpp b/Tools/ProtoProxy/Connection.cpp
index 8dc82157a..b21d2ae59 100644
--- a/Tools/ProtoProxy/Connection.cpp
+++ b/Tools/ProtoProxy/Connection.cpp
@@ -2197,32 +2197,38 @@ bool cConnection::HandleServerSpawnMob(void)
+struct sSpawnData
+{
+ AString m_Name;
+ AString m_Value;
+ AString m_Signature;
+ sSpawnData(const AString & a_Name, const AString & a_Value, const AString & a_Signature) :
+ m_Name(a_Name),
+ m_Value(a_Value),
+ m_Signature(a_Signature)
+ {
+ }
+};
+
+typedef std::vector<sSpawnData> sSpawnDatas;
+
+
+
+
+
bool cConnection::HandleServerSpawnNamedEntity(void)
{
HANDLE_SERVER_PACKET_READ(ReadVarInt, UInt32, EntityID);
HANDLE_SERVER_PACKET_READ(ReadVarUTF8String, AString, EntityUUID);
HANDLE_SERVER_PACKET_READ(ReadVarUTF8String, AString, EntityName);
HANDLE_SERVER_PACKET_READ(ReadVarInt, UInt32, DataCount);
- struct sData
- {
- AString m_Name;
- AString m_Value;
- AString m_Signature;
- sData(const AString & a_Name, const AString & a_Value, const AString & a_Signature) :
- m_Name(a_Name),
- m_Value(a_Value),
- m_Signature(a_Signature)
- {
- }
- };
- typedef std::vector<sData> sDataVec;
- sDataVec Data;
+ sSpawnDatas Data;
for (UInt32 i = 0; i < DataCount; i++)
{
HANDLE_SERVER_PACKET_READ(ReadVarUTF8String, AString, Name)
HANDLE_SERVER_PACKET_READ(ReadVarUTF8String, AString, Value)
HANDLE_SERVER_PACKET_READ(ReadVarUTF8String, AString, Signature)
- Data.push_back(sData(Name, Value, Signature));
+ Data.push_back(sSpawnData(Name, Value, Signature));
}
HANDLE_SERVER_PACKET_READ(ReadBEInt, int, PosX);
HANDLE_SERVER_PACKET_READ(ReadBEInt, int, PosY);
@@ -2242,7 +2248,7 @@ bool cConnection::HandleServerSpawnNamedEntity(void)
Log(" UUID = \"%s\"", EntityUUID.c_str());
Log(" Name = \"%s\"", EntityName.c_str());
Log(" NumData = %u", DataCount);
- for (sDataVec::const_iterator itr = Data.begin(), end = Data.end(); itr != end; ++itr)
+ for (sSpawnDatas::const_iterator itr = Data.begin(), end = Data.end(); itr != end; ++itr)
{
Log(" Name = \"%s\", Value = \"%s\", Signature = \"%s\"",
itr->m_Name.c_str(), itr->m_Value.c_str(), itr->m_Signature.c_str()