flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

ProtoProxy: Added handling for the Explosion packet.

Browse Source 
This will help #129.
This commit is contained in:
madmaxoft 2013-09-19 21:51:59 +02:00
parent 18d795d8da
commit 19bfab9eca
2 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Tools/ProtoProxy/Connection.cpp
View File

@ -189,6 +189,7 @@ enum
PACKET_BLOCK_CHANGE = 0x35, PACKET_BLOCK_CHANGE = 0x35,
PACKET_BLOCK_ACTION = 0x36, PACKET_BLOCK_ACTION = 0x36,
PACKET_MAP_CHUNK_BULK = 0x38, PACKET_MAP_CHUNK_BULK = 0x38,
PACKET_EXPLOSION = 0x3c,
PACKET_SOUND_EFFECT = 0x3d, PACKET_SOUND_EFFECT = 0x3d,
PACKET_NAMED_SOUND_EFFECT = 0x3e, PACKET_NAMED_SOUND_EFFECT = 0x3e,
PACKET_CHANGE_GAME_STATE = 0x46, PACKET_CHANGE_GAME_STATE = 0x46,
@ -701,6 +702,7 @@ bool cConnection::DecodeServersPackets(const char * a_Data, int a_Size)
case PACKET_ENTITY_STATUS: HANDLE_SERVER_READ(HandleServerEntityStatus); break; case PACKET_ENTITY_STATUS: HANDLE_SERVER_READ(HandleServerEntityStatus); break;
case PACKET_ENTITY_TELEPORT: HANDLE_SERVER_READ(HandleServerEntityTeleport); break; case PACKET_ENTITY_TELEPORT: HANDLE_SERVER_READ(HandleServerEntityTeleport); break;
case PACKET_ENTITY_VELOCITY: HANDLE_SERVER_READ(HandleServerEntityVelocity); break; case PACKET_ENTITY_VELOCITY: HANDLE_SERVER_READ(HandleServerEntityVelocity); break;
case PACKET_EXPLOSION: HANDLE_SERVER_READ(HandleServerExplosion); break;
case PACKET_INCREMENT_STATISTIC: HANDLE_SERVER_READ(HandleServerIncrementStatistic); break; case PACKET_INCREMENT_STATISTIC: HANDLE_SERVER_READ(HandleServerIncrementStatistic); break;
case PACKET_KEEPALIVE: HANDLE_SERVER_READ(HandleServerKeepAlive); break; case PACKET_KEEPALIVE: HANDLE_SERVER_READ(HandleServerKeepAlive); break;
case PACKET_KICK: HANDLE_SERVER_READ(HandleServerKick); break; case PACKET_KICK: HANDLE_SERVER_READ(HandleServerKick); break;
@ -1593,6 +1595,49 @@ bool cConnection::HandleServerEntityVelocity(void)
bool cConnection::HandleServerExplosion(void)
{
HANDLE_SERVER_PACKET_READ(ReadBEDouble, double, PosX);
HANDLE_SERVER_PACKET_READ(ReadBEDouble, double, PosY);
HANDLE_SERVER_PACKET_READ(ReadBEDouble, double, PosZ);
HANDLE_SERVER_PACKET_READ(ReadBEFloat, float, Force);
HANDLE_SERVER_PACKET_READ(ReadBEInt, int, NumRecords);
struct sCoords
{
int x, y, z;
sCoords(int a_X, int a_Y, int a_Z) : x(a_X), y(a_Y), z(a_Z) {}
} ;
std::vector<sCoords> Records;
Records.reserve(NumRecords);
int PosXI = (int)PosX, PosYI = (int)PosY, PosZI = (int)PosZ;
for (int i = 0; i < NumRecords; i++)
{
HANDLE_SERVER_PACKET_READ(ReadChar, char, rx);
HANDLE_SERVER_PACKET_READ(ReadChar, char, ry);
HANDLE_SERVER_PACKET_READ(ReadChar, char, rz);
Records.push_back(sCoords(PosXI + rx, PosYI + ry, PosZI + rz));
}
HANDLE_SERVER_PACKET_READ(ReadBEFloat, float, PlayerMotionX);
HANDLE_SERVER_PACKET_READ(ReadBEFloat, float, PlayerMotionY);
HANDLE_SERVER_PACKET_READ(ReadBEFloat, float, PlayerMotionZ);
Log("Received a PACKET_EXPLOSION from the server:");
Log(" Pos = {%.02f, %.02f, %.02f}", PosX, PosY, PosZ);
Log(" Force = %.02f", Force);
Log(" NumRecords = %d", NumRecords);
for (int i = 0; i < NumRecords; i++)
{
Log(" Records[%d] = {%d, %d, %d}", i, Records[i].x, Records[i].y, Records[i].z);
}
Log(" Player motion = <%.02f, %.02f, %.02f>", PlayerMotionX, PlayerMotionY, PlayerMotionZ);
COPY_TO_CLIENT();
return true;
}
bool cConnection::HandleServerIncrementStatistic(void) bool cConnection::HandleServerIncrementStatistic(void)
{ {
// 0xc8 // 0xc8

1
Tools/ProtoProxy/Connection.h
View File

@ -158,6 +158,7 @@ protected:
bool HandleServerEntityStatus(void); bool HandleServerEntityStatus(void);
bool HandleServerEntityTeleport(void); bool HandleServerEntityTeleport(void);
bool HandleServerEntityVelocity(void); bool HandleServerEntityVelocity(void);
bool HandleServerExplosion(void);
bool HandleServerIncrementStatistic(void); bool HandleServerIncrementStatistic(void);
bool HandleServerKeepAlive(void); bool HandleServerKeepAlive(void);
bool HandleServerKick(void); bool HandleServerKick(void);