OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2025-11-06 11:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed redundant checks for a nullptr from PlayerManager::getPlayer()

Browse Source 
These were written in desparation and never should have been there in
the first place.
This commit is contained in:
dongresource
2020-12-01 20:18:01 +01:00
parent c43a3d64fb
commit 1e822f7a6c
10 changed files with 21 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ItemManager.cpp
View File

@@ -234,7 +234,7 @@ void ItemManager::itemUseHandler(CNSocket* sock, CNPacketData* data) {
sP_CL2FE_REQ_ITEM_USE* request = (sP_CL2FE_REQ_ITEM_USE*)data->buf;
Player* player = PlayerManager::getPlayer(sock);
if (player == nullptr || request->iSlotNum < 0 || request->iSlotNum >= AINVEN_COUNT)
if (request->iSlotNum < 0 || request->iSlotNum >= AINVEN_COUNT)
return; // sanity check
// gumball can only be used from inventory, so we ignore eIL
@@ -840,9 +840,6 @@ void ItemManager::chestOpenHandler(CNSocket *sock, CNPacketData *data) {
INITSTRUCT(sP_FE2CL_REP_ITEM_CHEST_OPEN_SUCC, resp);
resp.iSlotNum = chest->iSlotNum;
if (plr == nullptr)
return;
// item giving packet
const size_t resplen = sizeof(sP_FE2CL_REP_REWARD_ITEM) + sizeof(sItemReward);
assert(resplen < CN_PACKET_BUFFER_SIZE - 8);