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

Do not auto-register all fast travel destinations for GMs

Browse Source 
Instead, players with access level 50 or higher can use /registerall and
/unregisterall.
This commit is contained in:
dongresource 2021-01-05 12:43:11 +01:00
parent 74e06f1084
commit deca220d43
2 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/ChatManager.cpp
View File

@ -802,6 +802,40 @@ void warpableCommand(std::string full, std::vector<std::string>& args, CNSocket*
plr->unwarpable = false; plr->unwarpable = false;
} }
void registerallCommand(std::string full, std::vector<std::string>& args, CNSocket* sock) {
Player *plr = PlayerManager::getPlayer(sock);
plr->iWarpLocationFlag = UINT32_MAX;
plr->aSkywayLocationFlag[0] = UINT64_MAX;
plr->aSkywayLocationFlag[1] = UINT64_MAX;
// update the client
INITSTRUCT(sP_FE2CL_REP_PC_REGIST_TRANSPORTATION_LOCATION_SUCC, resp);
resp.iWarpLocationFlag = plr->iWarpLocationFlag;
resp.aWyvernLocationFlag[0] = plr->aSkywayLocationFlag[0];
resp.aWyvernLocationFlag[1] = plr->aSkywayLocationFlag[1];
sock->sendPacket((void*)&resp, P_FE2CL_REP_PC_REGIST_TRANSPORTATION_LOCATION_SUCC, sizeof(sP_FE2CL_REP_PC_REGIST_TRANSPORTATION_LOCATION_SUCC));
}
void unregisterallCommand(std::string full, std::vector<std::string>& args, CNSocket* sock) {
Player *plr = PlayerManager::getPlayer(sock);
plr->iWarpLocationFlag = 0;
plr->aSkywayLocationFlag[0] = 0;
plr->aSkywayLocationFlag[1] = 0;
// update the client
INITSTRUCT(sP_FE2CL_REP_PC_REGIST_TRANSPORTATION_LOCATION_SUCC, resp);
resp.iWarpLocationFlag = plr->iWarpLocationFlag;
resp.aWyvernLocationFlag[0] = plr->aSkywayLocationFlag[0];
resp.aWyvernLocationFlag[1] = plr->aSkywayLocationFlag[1];
sock->sendPacket((void*)&resp, P_FE2CL_REP_PC_REGIST_TRANSPORTATION_LOCATION_SUCC, sizeof(sP_FE2CL_REP_PC_REGIST_TRANSPORTATION_LOCATION_SUCC));
}
void ChatManager::init() { void ChatManager::init() {
REGISTER_SHARD_PACKET(P_CL2FE_REQ_SEND_FREECHAT_MESSAGE, chatHandler); REGISTER_SHARD_PACKET(P_CL2FE_REQ_SEND_FREECHAT_MESSAGE, chatHandler);
REGISTER_SHARD_PACKET(P_CL2FE_REQ_PC_AVATAR_EMOTES_CHAT, emoteHandler); REGISTER_SHARD_PACKET(P_CL2FE_REQ_PC_AVATAR_EMOTES_CHAT, emoteHandler);
@ -836,6 +870,8 @@ void ChatManager::init() {
registerCommand("unhide", 100, unhideCommand, "un-hide yourself from the global player map"); registerCommand("unhide", 100, unhideCommand, "un-hide yourself from the global player map");
registerCommand("unwarpable", 100, unwarpableCommand, "prevent buddies from warping to you"); registerCommand("unwarpable", 100, unwarpableCommand, "prevent buddies from warping to you");
registerCommand("warpable", 100, warpableCommand, "re-allow buddies to warp to you"); registerCommand("warpable", 100, warpableCommand, "re-allow buddies to warp to you");
registerCommand("registerall", 50, registerallCommand, "register all SCAMPER and MSS destinations");
registerCommand("unregisterall", 50, unregisterallCommand, "clear all SCAMPER and MSS destinations");
registerCommand("redeem", 100, redeemCommand, "redeem a code item"); registerCommand("redeem", 100, redeemCommand, "redeem a code item");
} }

16
src/TransportManager.cpp
View File

@ -45,7 +45,7 @@ void TransportManager::transportRegisterLocationHandler(CNSocket* sock, CNPacket
} }
// update registration bitfield using bitmask // update registration bitfield using bitmask
uint32_t newScamperFlag = plr->iWarpLocationFlag | (plr->accountLevel <= 40 ? INT32_MAX : (1UL << (transport->iLocationID - 1))); uint32_t newScamperFlag = plr->iWarpLocationFlag | (1UL << (transport->iLocationID - 1));
if (newScamperFlag != plr->iWarpLocationFlag) { if (newScamperFlag != plr->iWarpLocationFlag) {
plr->iWarpLocationFlag = newScamperFlag; plr->iWarpLocationFlag = newScamperFlag;
newReg = true; newReg = true;
@ -66,17 +66,11 @@ void TransportManager::transportRegisterLocationHandler(CNSocket* sock, CNPacket
/* /*
* assuming the two bitfields are just stuck together to make a longer one, do a similar operation * assuming the two bitfields are just stuck together to make a longer one, do a similar operation
*/ */
if (plr->accountLevel <= 40) { int index = transport->iLocationID > 64 ? 1 : 0;
plr->aSkywayLocationFlag[0] = INT64_MAX; uint64_t newMonkeyFlag = plr->aSkywayLocationFlag[index] | (1ULL << (index ? transport->iLocationID - 65 : transport->iLocationID - 1));
plr->aSkywayLocationFlag[1] = INT64_MAX; if (newMonkeyFlag != plr->aSkywayLocationFlag[index]) {
plr->aSkywayLocationFlag[index] = newMonkeyFlag;
newReg = true; newReg = true;
} else {
int index = transport->iLocationID > 64 ? 1 : 0;
uint64_t newMonkeyFlag = plr->aSkywayLocationFlag[index] | (1ULL << (index ? transport->iLocationID - 65 : transport->iLocationID - 1));
if (newMonkeyFlag != plr->aSkywayLocationFlag[index]) {
plr->aSkywayLocationFlag[index] = newMonkeyFlag;
newReg = true;
}
} }
} else { } else {
std::cout << "[WARN] Unknown mode of transport; eTT = " << transport->eTT << std::endl; std::cout << "[WARN] Unknown mode of transport; eTT = " << transport->eTT << std::endl;