OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2025-11-24 02:10:21 +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

26
src/MissionManager.cpp
View File

@@ -67,9 +67,6 @@ void MissionManager::taskStart(CNSocket* sock, CNPacketData* data) {
INITSTRUCT(sP_FE2CL_REP_PC_TASK_START_SUCC, response);
Player *plr = PlayerManager::getPlayer(sock);
if (plr == nullptr)
return;
if (!startTask(plr, missionData->iTaskNum, false)) {
// TODO: TASK_FAIL?
response.iTaskNum = missionData->iTaskNum;
@@ -138,9 +135,6 @@ void MissionManager::taskEnd(CNSocket* sock, CNPacketData* data) {
bool MissionManager::endTask(CNSocket *sock, int32_t taskNum) {
Player *plr = PlayerManager::getPlayer(sock);
if (plr == nullptr)
return false;
if (Tasks.find(taskNum) == Tasks.end())
return false;
@@ -207,9 +201,6 @@ void MissionManager::setMission(CNSocket* sock, CNPacketData* data) {
Player* plr = PlayerManager::getPlayer(sock);
if (plr == nullptr)
return;
sP_CL2FE_REQ_PC_SET_CURRENT_MISSION_ID* missionData = (sP_CL2FE_REQ_PC_SET_CURRENT_MISSION_ID*)data->buf;
INITSTRUCT(sP_FE2CL_REP_PC_SET_CURRENT_MISSION_ID, response);
response.iCurrentMissionID = missionData->iCurrentMissionID;
@@ -229,7 +220,7 @@ void MissionManager::quitMission(CNSocket* sock, CNPacketData* data) {
void MissionManager::quitTask(CNSocket* sock, int32_t taskNum, bool manual) {
Player* plr = PlayerManager::getPlayer(sock);
if (plr == nullptr || Tasks.find(taskNum) == Tasks.end())
if (Tasks.find(taskNum) == Tasks.end())
return; // sanity check
// update player
@@ -300,9 +291,6 @@ void MissionManager::dropQuestItem(CNSocket *sock, int task, int count, int id,
Player *plr = PlayerManager::getPlayer(sock);
if (plr == nullptr)
return;
uint8_t respbuf[resplen]; // not a variable length array, don't worry
sP_FE2CL_REP_REWARD_ITEM *reward = (sP_FE2CL_REP_REWARD_ITEM *)respbuf;
sItemReward *item = (sItemReward *)(respbuf + sizeof(sP_FE2CL_REP_REWARD_ITEM));
@@ -354,9 +342,6 @@ int MissionManager::giveMissionReward(CNSocket *sock, int task) {
Reward *reward = Rewards[task];
Player *plr = PlayerManager::getPlayer(sock);
if (plr == nullptr)
return -1;
int nrewards = 0;
for (int i = 0; i < 4; i++) {
if (reward->itemIds[i] != 0)
@@ -438,9 +423,6 @@ int MissionManager::giveMissionReward(CNSocket *sock, int task) {
void MissionManager::updateFusionMatter(CNSocket* sock, int fusion) {
Player *plr = PlayerManager::getPlayer(sock);
if (plr == nullptr)
return;
plr->fusionmatter += fusion;
// there's a much lower FM cap in the Future
@@ -481,9 +463,6 @@ void MissionManager::updateFusionMatter(CNSocket* sock, int fusion) {
void MissionManager::mobKilled(CNSocket *sock, int mobid) {
Player *plr = PlayerManager::getPlayer(sock);
if (plr == nullptr)
return;
bool missionmob = false;
for (int i = 0; i < ACTIVE_MISSION_COUNT; i++) {
@@ -545,9 +524,6 @@ void MissionManager::saveMission(Player* player, int missionId) {
bool MissionManager::isQuestItemFull(CNSocket* sock, int itemId, int itemCount) {
Player* plr = PlayerManager::getPlayer(sock);
if (plr == nullptr)
return true;
int slot = findQSlot(plr, itemId);
if (slot == -1) {
// this should never happen