mirror of
https://github.com/celisej567/mcpe.git
synced 2026-09-11 20:11:18 +03:00
x
This commit is contained in:
@@ -10,6 +10,8 @@
|
||||
#include "SoundSystemWindows.hpp"
|
||||
#include "client/common/Utils.hpp"
|
||||
|
||||
// @TODO: fix crash in playAt when Asan is active
|
||||
|
||||
SoundSystemWindows::SoundSystemWindows()
|
||||
{
|
||||
printf("Init SoundSystemWindows\n");
|
||||
|
||||
@@ -93,6 +93,10 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& rakGuid, StartGa
|
||||
pLocalPlayer->m_yaw,
|
||||
pLocalPlayer->m_pitch);
|
||||
|
||||
pLocalPlayer->m_pInventory->prepareCreativeInventory();
|
||||
|
||||
m_pLevel->setTime(pStartGamePkt->m_time);
|
||||
|
||||
m_pMinecraft->setLevel(m_pLevel, "ClientSideNetworkHandler -> setLevel", pLocalPlayer);
|
||||
}
|
||||
|
||||
@@ -116,6 +120,8 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& rakGuid, AddPlay
|
||||
pPlayer->m_name = pAddPlayerPkt->m_name;
|
||||
pPlayer->m_guid = pAddPlayerPkt->m_guid;
|
||||
|
||||
pPlayer->m_pInventory->prepareCreativeInventory();
|
||||
|
||||
m_pMinecraft->m_gui.addMessage(pPlayer->m_name + " joined the game");
|
||||
}
|
||||
|
||||
|
||||
@@ -85,6 +85,8 @@ public:
|
||||
float field_10;
|
||||
float field_14;
|
||||
float field_18;
|
||||
int m_version = 0;
|
||||
int m_time = 0;
|
||||
};
|
||||
|
||||
class AddPlayerPacket : public Packet
|
||||
|
||||
@@ -22,6 +22,12 @@ void StartGamePacket::write(RakNet::BitStream* bs)
|
||||
bs->Write(field_10);
|
||||
bs->Write(field_14);
|
||||
bs->Write(field_18);
|
||||
|
||||
bs->Write(m_version);
|
||||
if (m_version >= 1)
|
||||
{
|
||||
bs->Write(m_time);
|
||||
}
|
||||
}
|
||||
|
||||
void StartGamePacket::read(RakNet::BitStream* bs)
|
||||
@@ -32,4 +38,12 @@ void StartGamePacket::read(RakNet::BitStream* bs)
|
||||
bs->Read(field_10);
|
||||
bs->Read(field_14);
|
||||
bs->Read(field_18);
|
||||
|
||||
if (!bs->Read(m_version))
|
||||
return;
|
||||
|
||||
if (m_version < 1)
|
||||
return;
|
||||
|
||||
bs->Read(m_time);
|
||||
}
|
||||
@@ -87,6 +87,8 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& guid, LoginPacke
|
||||
sgp.field_10 = pPlayer->m_pos.x;
|
||||
sgp.field_14 = pPlayer->m_pos.y - pPlayer->field_84;
|
||||
sgp.field_18 = pPlayer->m_pos.z;
|
||||
sgp.m_version = 1;
|
||||
sgp.m_time = m_pLevel->getTime();
|
||||
|
||||
RakNet::BitStream sgpbs;
|
||||
sgp.write(&sgpbs);
|
||||
|
||||
@@ -277,4 +277,6 @@ void Inventory::selectItemById(int itemID)
|
||||
selectItem(i);
|
||||
return;
|
||||
}
|
||||
|
||||
LogMsg("selectItemById: %d doesn't exist", itemID);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user