From c33f218e567a8d2855548404a0f7647c96dfc6b3 Mon Sep 17 00:00:00 2001
From: CPunch <sethtstubbs@gmail.com>
Date: Wed, 23 Sep 2020 16:04:58 -0500
Subject: [PATCH] updateFusionMatter now sets fusion matter

---
 src/MissionManager.cpp | 9 +++++----
 src/MissionManager.hpp | 2 +-
 src/MobManager.cpp     | 3 +--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/MissionManager.cpp b/src/MissionManager.cpp
index cc18ffc..e70beb3 100644
--- a/src/MissionManager.cpp
+++ b/src/MissionManager.cpp
@@ -302,7 +302,7 @@ int MissionManager::giveMissionReward(CNSocket *sock, int task) {
 
     // update player
     plr->money += reward->money;
-    plr->fusionmatter += reward->fusionmatter;
+    MissionManager::updateFusionMatter(sock, reward->fusionmatter);
 
     // simple rewards
     resp->m_iCandy = plr->money;
@@ -323,15 +323,15 @@ int MissionManager::giveMissionReward(CNSocket *sock, int task) {
 
     sock->sendPacket((void*)respbuf, P_FE2CL_REP_REWARD_ITEM, resplen);
 
-    MissionManager::updateFusionMatter(sock);
     return 0;
 }
 
-void MissionManager::updateFusionMatter(CNSocket* sock) {
+void MissionManager::updateFusionMatter(CNSocket* sock, int fusion) {
     Player *plr = PlayerManager::getPlayer(sock);
 
+    plr->fusionmatter += fusion;
+
     // check if it is over the limit
-    std::cout << plr->fusionmatter << " > " << AvatarGrowth[plr->level]["m_iReqBlob_NanoCreate"] << std::endl;
     if (plr->fusionmatter > AvatarGrowth[plr->level]["m_iReqBlob_NanoCreate"]) {
         // check if the nano task is already started
 
@@ -347,6 +347,7 @@ void MissionManager::updateFusionMatter(CNSocket* sock) {
         INITSTRUCT(sP_FE2CL_REP_PC_TASK_START_SUCC, response);
         response.iTaskNum = AvatarGrowth[plr->level]["m_iNanoQuestTaskID"];
         sock->sendPacket((void*)&response, P_FE2CL_REP_PC_TASK_START_SUCC, sizeof(sP_FE2CL_REP_PC_TASK_START_SUCC));
+        return;
     }
 }
 
diff --git a/src/MissionManager.hpp b/src/MissionManager.hpp
index df19f0f..4ecf75c 100644
--- a/src/MissionManager.hpp
+++ b/src/MissionManager.hpp
@@ -51,7 +51,7 @@ namespace MissionManager {
     //checks if player doesn't have n/n quest items
     bool isQuestItemFull(CNSocket* sock, int itemId, int itemCount);
     int giveMissionReward(CNSocket *sock, int task);
-    void updateFusionMatter(CNSocket* sock);
+    void updateFusionMatter(CNSocket* sock, int fusion);
 
     void mobKilled(CNSocket *sock, int mobid);
 
diff --git a/src/MobManager.cpp b/src/MobManager.cpp
index 9d87d6a..f65ae3a 100644
--- a/src/MobManager.cpp
+++ b/src/MobManager.cpp
@@ -105,7 +105,7 @@ void MobManager::giveReward(CNSocket *sock) {
 
     // update player
     plr->money += 50;
-    plr->fusionmatter += 70;
+    MissionManager::updateFusionMatter(sock, 70);
 
     // simple rewards
     reward->m_iCandy = plr->money;
@@ -132,7 +132,6 @@ void MobManager::giveReward(CNSocket *sock) {
         sock->sendPacket((void*)respbuf, P_FE2CL_REP_REWARD_ITEM, resplen);
     }
 
-    MissionManager::updateFusionMatter(sock);
 }
 
 void MobManager::killMob(CNSocket *sock, Mob *mob) {