Disabled GM mode (#22)

Temporarily disabled, players can now use item commands without GM mode.
This commit is contained in:
JadeShrineMaiden 2020-08-22 01:38:10 +01:00 committed by GitHub
parent 786ee5f4f4
commit ab6df26f92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 11 deletions

View File

@ -192,14 +192,15 @@ void CNLoginServer::handlePacket(CNSocket* sock, CNPacketData* data) {
int64_t UID = character->PCStyle.iPC_UID; int64_t UID = character->PCStyle.iPC_UID;
bool BecomeGM; // commented and disabled for now
//bool BecomeGM;
if (U16toU8(character->PCStyle.szFirstName) == settings::GMPASS) { //if (U16toU8(character->PCStyle.szFirstName) == settings::GMPASS) {
BecomeGM = true; // BecomeGM = true;
U8toU16("GM",character->PCStyle.szFirstName); // U8toU16("GM",character->PCStyle.szFirstName);
} else { //} else {
BecomeGM = false; // BecomeGM = false;
} //}
character->PCStyle.iNameCheck = 1; character->PCStyle.iNameCheck = 1;
response->sPC_Style = character->PCStyle; response->sPC_Style = character->PCStyle;
@ -225,7 +226,7 @@ void CNLoginServer::handlePacket(CNSocket* sock, CNPacketData* data) {
loginSessions[sock].characters[UID].Equip[2].iType = 2; loginSessions[sock].characters[UID].Equip[2].iType = 2;
loginSessions[sock].characters[UID].Equip[3].iID = character->sOn_Item.iEquipFootID; // foot! loginSessions[sock].characters[UID].Equip[3].iID = character->sOn_Item.iEquipFootID; // foot!
loginSessions[sock].characters[UID].Equip[3].iType = 3; loginSessions[sock].characters[UID].Equip[3].iType = 3;
loginSessions[sock].characters[UID].IsGM = BecomeGM; loginSessions[sock].characters[UID].IsGM = false;
sock->sendPacket(new CNPacketData((void*)response, P_LS2CL_REP_CHAR_CREATE_SUCC, sizeof(sP_LS2CL_REP_CHAR_CREATE_SUCC), sock->getEKey())); sock->sendPacket(new CNPacketData((void*)response, P_LS2CL_REP_CHAR_CREATE_SUCC, sizeof(sP_LS2CL_REP_CHAR_CREATE_SUCC), sock->getEKey()));
break; break;

View File

@ -98,10 +98,11 @@ void ItemManager::itemGMGiveHandler(CNSocket* sock, CNPacketData* data) {
sP_CL2FE_REQ_PC_GIVE_ITEM* itemreq = (sP_CL2FE_REQ_PC_GIVE_ITEM*)data->buf; sP_CL2FE_REQ_PC_GIVE_ITEM* itemreq = (sP_CL2FE_REQ_PC_GIVE_ITEM*)data->buf;
PlayerView& plr = PlayerManager::players[sock]; PlayerView& plr = PlayerManager::players[sock];
if (!plr.plr.IsGM) { // Commented and disabled for future use
//if (!plr.plr.IsGM) {
// TODO: send fail packet // TODO: send fail packet
return; // return;
} //}
if (itemreq->eIL == 2) { if (itemreq->eIL == 2) {
// Quest item, not a real item, handle this later, stubbed for now // Quest item, not a real item, handle this later, stubbed for now