aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/AddPlayerPacket.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-08 19:08:36 -0400
committerGitHub <noreply@github.com>2026-03-08 18:08:36 -0500
commit28614b922fb77149a54da1a87bebfbc98736f296 (patch)
tree7f828ba86a4ee18d0a80d29de64f6199a5412512 /Minecraft.World/AddPlayerPacket.cpp
parent88798b501d0cf6287b6f87acb2592676e3cec58d (diff)
Modernize project codebase (#906)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides * Add safety checks and fix a issue with vector going OOR
Diffstat (limited to 'Minecraft.World/AddPlayerPacket.cpp')
-rw-r--r--Minecraft.World/AddPlayerPacket.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/Minecraft.World/AddPlayerPacket.cpp b/Minecraft.World/AddPlayerPacket.cpp
index 93984367..fbee1fc5 100644
--- a/Minecraft.World/AddPlayerPacket.cpp
+++ b/Minecraft.World/AddPlayerPacket.cpp
@@ -24,12 +24,12 @@ AddPlayerPacket::AddPlayerPacket()
m_capeId = 0;
m_uiGamePrivileges = 0;
entityData = nullptr;
- unpack = NULL;
+ unpack = nullptr;
}
AddPlayerPacket::~AddPlayerPacket()
{
- if(unpack != NULL) delete unpack;
+ if(unpack != nullptr) delete unpack;
}
AddPlayerPacket::AddPlayerPacket(shared_ptr<Player> player, PlayerUID xuid, PlayerUID OnlineXuid,int xp, int yp, int zp, int yRotp, int xRotp, int yHeadRotp)
@@ -51,17 +51,17 @@ AddPlayerPacket::AddPlayerPacket(shared_ptr<Player> player, PlayerUID xuid, Play
//printf("%d: New add player (%f,%f,%f) : (%d,%d,%d) : xRot %d, yRot %d\n",id,player->x,player->y,player->z,x,y,z,xRot,yRot);
shared_ptr<ItemInstance> itemInstance = player->inventory->getSelected();
- carriedItem = itemInstance == NULL ? 0 : itemInstance->id;
+ carriedItem = itemInstance == nullptr ? 0 : itemInstance->id;
this->xuid = xuid;
this->OnlineXuid = OnlineXuid;
- m_playerIndex = (BYTE)player->getPlayerIndex();
+ m_playerIndex = static_cast<BYTE>(player->getPlayerIndex());
m_skinId = player->getCustomSkin();
m_capeId = player->getCustomCape();
m_uiGamePrivileges = player->getAllPlayerGamePrivileges();
entityData = player->getEntityData();
- unpack = NULL;
+ unpack = nullptr;
}
void AddPlayerPacket::read(DataInputStream *dis) //throws IOException
@@ -119,11 +119,11 @@ int AddPlayerPacket::getEstimatedSize()
{
int iSize= sizeof(int) + Player::MAX_NAME_LENGTH + sizeof(int) + sizeof(int) + sizeof(int) + sizeof(BYTE) + sizeof(BYTE) +sizeof(short) + sizeof(PlayerUID) + sizeof(PlayerUID) + sizeof(int) + sizeof(BYTE) + sizeof(unsigned int) + sizeof(byte);
- if( entityData != NULL )
+ if( entityData != nullptr )
{
iSize += entityData->getSizeInBytes();
}
- else if( unpack != NULL )
+ else if( unpack != nullptr )
{
// 4J Stu - This is an incoming value which we aren't currently analysing
//iSize += unpack->get
@@ -134,7 +134,7 @@ int AddPlayerPacket::getEstimatedSize()
vector<shared_ptr<SynchedEntityData::DataItem> > *AddPlayerPacket::getUnpackedData()
{
- if (unpack == NULL)
+ if (unpack == nullptr)
{
unpack = entityData->getAll();
}