server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2023-03-29 16:10:52 +08:00
parent 11c3f8139f
commit aa8283d53e
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/gameserver/mt/Buff.cc
View File

@ -57,14 +57,18 @@ namespace mt
}
}
{
std::vector<std::string> strings;
a8::Split(buff_param2(), strings, '|');
if (buff_param2().find(":") != std::string::npos) {
A8_ABORT();
}
for (auto& str : strings) {
_buff_param2_int_list.push_back(a8::XValue(str).GetInt());
_buff_param2_int_set.insert(a8::XValue(str).GetInt());
if (buff_effect() == kBET_CallFunc &&
(int)BuffCallFunc_e::kSetBulletBornOffset == _int_buff_param1) {
} else {
std::vector<std::string> strings;
a8::Split(buff_param2(), strings, '|');
if (buff_param2().find(":") != std::string::npos) {
A8_ABORT();
}
for (auto& str : strings) {
_buff_param2_int_list.push_back(a8::XValue(str).GetInt());
_buff_param2_int_set.insert(a8::XValue(str).GetInt());
}
}
}
{

3
server/gameserver/shot.cc
View File

@ -363,7 +363,8 @@ void InternalShot(Creature* c,
return;
}
auto bullet_born_offset_ptr = &weapon_meta->_bullet_born_offset;
if (c->GetCurrWeapon()->meta == weapon_meta) {
if (c->GetCurrWeapon()->meta == weapon_meta &&
c->GetCurrWeapon()->bullet_born_offset_ptr) {
bullet_born_offset_ptr = c->GetCurrWeapon()->bullet_born_offset_ptr;
}
for (auto& tuple : *bullet_born_offset_ptr) {

2
third_party/a8 vendored

@ -1 +1 @@
Subproject commit 50c04d6bc15bf633f4980039db8be6e61e5b6b55
Subproject commit b6c896a7c5be517ba12d1b069d58103b6214f09f