metin-server/m2dev-server-src
3
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

some fixes

Browse Source
This commit is contained in:
meneleos
2025-09-26 22:03:13 +03:00
parent fff90d6c6c
commit 173c6828a8
5 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/game/input_db.cpp
View File

@@ -396,6 +396,7 @@ void CInputDB::PlayerLoad(LPDESC d, const char * data)
if (NULL != CHARACTER_MANAGER::Instance().FindPC(pTab->name))
{
sys_err("InputDB: PlayerLoad : %s already exist in game", pTab->name);
d->SetPhase(PHASE_CLOSE);
return;
}
@@ -1411,7 +1412,7 @@ void CInputDB::GuildSkillRecharge()
void CInputDB::GuildExpUpdate(const char* c_pData)
{
TPacketGuildSkillUpdate * p = (TPacketGuildSkillUpdate *) c_pData;
TPacketGuildExpUpdate * p = (TPacketGuildExpUpdate *) c_pData;
sys_log(1, "GuildExpUpdate %d", p->amount);
CGuild * g = CGuildManager::instance().TouchGuild(p->guild_id);

24
src/game/input_login.cpp
View File

@@ -197,6 +197,12 @@ void CInputLogin::ChangeName(LPDESC d, const char * data)
return;
}
if (p->index < 0 || p->index >= PLAYER_PER_ACCOUNT)
{
sys_err("index overflow %d, login: %s", p->index, c_r.login);
return;
}
if (!c_r.players[p->index].bChangeName)
return;
@@ -229,12 +235,19 @@ void CInputLogin::CharacterSelect(LPDESC d, const char * data)
return;
}
if (pinfo->index >= PLAYER_PER_ACCOUNT)
if (pinfo->index < 0 || pinfo->index >= PLAYER_PER_ACCOUNT)
{
sys_err("index overflow %d, login: %s", pinfo->index, c_r.login);
return;
}
if (c_r.players[pinfo->index].dwID == 0)
{
sys_err("player index(%d) is null. login %s",
pinfo->index, c_r.login);
return;
}
if (c_r.players[pinfo->index].bChangeName)
{
sys_err("name must be changed idx %d, login %s, name %s",
@@ -431,6 +444,13 @@ void CInputLogin::CharacterCreate(LPDESC d, const char * data)
return;
}
if (pinfo->index < 0 || pinfo->index >= PLAYER_PER_ACCOUNT)
{
sys_err("index overflow %d, login: %s", pinfo->index, d->GetAccountTable().login);
d->Packet(&packFailure, sizeof(packFailure));
return;
}
// 사용할 수 없는 이름이거나, 잘못된 평상복이면 생설 실패
if (!check_name(pinfo->name) || pinfo->shape > 1)
{
@@ -502,7 +522,7 @@ void CInputLogin::CharacterDelete(LPDESC d, const char * data)
sys_log(0, "PlayerDelete: login: %s index: %d, social_id %s", c_rAccountTable.login, pinfo->index, pinfo->private_code);
if (pinfo->index >= PLAYER_PER_ACCOUNT)
if (pinfo->index < 0 || pinfo->index >= PLAYER_PER_ACCOUNT)
{
sys_err("PlayerDelete: index overflow %d, login: %s", pinfo->index, c_rAccountTable.login);
return;