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

1

Browse Source
This commit is contained in:
aozhiwei 2021-04-16 10:15:00 +08:00
parent d07a30345f
commit b8876aa397
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/player.cc
View File

@ -129,15 +129,11 @@ void Player::InternalUpdate(int delta_time)
if (has_use_item_id) { if (has_use_item_id) {
UpdateUseItemId(); UpdateUseItemId();
} }
<<<<<<< HEAD
UpdateViewObjects(); UpdateViewObjects();
}
=======
if (playing_skill) { if (playing_skill) {
UpdateSkill(); UpdateSkill();
} }
} }
>>>>>>> dev
} }
void Player::UpdateMove() void Player::UpdateMove()