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

移除Human里的timer_attacher

Browse Source
This commit is contained in:
aozhiwei 2020-05-25 10:06:32 +08:00
parent 0c7c8eb5df
commit a428f6ebc5
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/human.cc
View File

@ -2892,7 +2892,7 @@ void Human::AddItem(int item_id, int item_num)
items_[item_id] = item_num; items_[item_id] = item_num;
} }
if (room->frame_no > join_frameno) { if (room && room->frame_no > join_frameno) {
room->frame_event.AddItemChg(this, item_id, items_[item_id]); room->frame_event.AddItemChg(this, item_id, items_[item_id]);
} else { } else {
if (item_num <= 0) { if (item_num <= 0) {

1
server/gameserver/human.h
View File

@ -46,7 +46,6 @@ class Human : public MoveableEntity
MetaData::Dress* skin_jlf_meta = nullptr; MetaData::Dress* skin_jlf_meta = nullptr;
MetaData::Equip* skin_tank_meta = nullptr; MetaData::Equip* skin_tank_meta = nullptr;
HumanAbility ability; HumanAbility ability;
a8::XTimerAttacher xtimer_attacher;
a8::Vec2 move_dir; a8::Vec2 move_dir;
a8::Vec2 attack_dir; a8::Vec2 attack_dir;

2
server/gameserver/metadata.cc
View File

@ -491,7 +491,7 @@ namespace MetaData
{ {
std::vector<std::string> strings; std::vector<std::string> strings;
a8::Split(i->drop(), strings, ':'); a8::Split(i->drop(), strings, ':');
if (strings.size() < 2) { if (strings.size() >= 2) {
drop.push_back(std::make_tuple( drop.push_back(std::make_tuple(
a8::XValue(strings[0]), a8::XValue(strings[0]),
a8::XValue(strings[1]) a8::XValue(strings[1])