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

Fix group recall and temporarily lift range restriction

Browse Source
This commit is contained in:
Gent S 2020-11-27 15:31:56 -05:00
parent c343092bd5
commit 7cc0a0fc82
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/NanoManager.cpp
View File

@ -551,7 +551,7 @@ std::vector<int> NanoManager::findTargets(Player* plr, int skillID, CNPacketData
Player *otherPlr2 = PlayerManager::getPlayerFromID(otherPlr->groupIDs[i]); Player *otherPlr2 = PlayerManager::getPlayerFromID(otherPlr->groupIDs[i]);
if (otherPlr2 == nullptr) if (otherPlr2 == nullptr)
continue; continue;
if (hypot(otherPlr2->x - plr->x, otherPlr2->y - plr->y) < SkillTable[skillID].effectArea) { if (true) {//hypot(otherPlr2->x - plr->x, otherPlr2->y - plr->y) < SkillTable[skillID].effectArea) {
tD[i+1] = otherPlr->groupIDs[i]; tD[i+1] = otherPlr->groupIDs[i];
tD[0] += 1; tD[0] += 1;
} }
@ -859,10 +859,8 @@ void nanoPower(CNSocket *sock, std::vector<int> targetData,
for (int i = 0; i < targetData[0]; i++) { for (int i = 0; i < targetData[0]; i++) {
if (SkillTable[skillID].targetType == 3 && PlayerManager::getSockFromID(targetData[i + 1]) != nullptr) if (SkillTable[skillID].targetType == 3 && PlayerManager::getSockFromID(targetData[i + 1]) != nullptr)
workSock = PlayerManager::getSockFromID(targetData[i+1]); workSock = PlayerManager::getSockFromID(targetData[i+1]);
if (skillType == EST_RECALL || skillType == EST_RECALL_GROUP)
targetData[i+1] = plr->iID;
if (!work(workSock, respdata, i, targetData[i+1], bitFlag, timeBuffID, duration, amount)) if (!work(workSock, respdata, i, targetData[i+1], bitFlag, timeBuffID, duration, amount))
return; return; // TODO: Jade fix pls (name in popup is wrong)
} }
sock->sendPacket((void*)&respbuf, P_FE2CL_NANO_SKILL_USE_SUCC, resplen); sock->sendPacket((void*)&respbuf, P_FE2CL_NANO_SKILL_USE_SUCC, resplen);