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-09-28 13:32:34 +00:00
parent ba6b3fa91f
commit acd2f08cb0
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/creature.cc
View File

@ -2828,9 +2828,11 @@ bool Creature::CanFollow(Creature* follower)
if (follower->GetUniId() == GetUniId()) { if (follower->GetUniId() == GetUniId()) {
return false; return false;
} }
#if 0
if (!follower->IsPlayer()) { if (!follower->IsPlayer()) {
return false; return false;
} }
#endif
if (follower->team_id != team_id) { if (follower->team_id != team_id) {
return false; return false;
} }
@ -2846,9 +2848,11 @@ bool Creature::CanFollow(Creature* follower)
return false; return false;
} }
#if 0
if (!IsPlayer()) { if (!IsPlayer()) {
return false; return false;
} }
#endif
if (HasBuffEffect(kBET_Jump)) { if (HasBuffEffect(kBET_Jump)) {
return false; return false;
} }

3
server/gameserver/matchteam.cc
View File

@ -256,6 +256,9 @@ void MatchTeam::UpdateMaster()
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
AutoChoose(true); AutoChoose(true);
} }
for (auto& member : curr_member_hash_) {
member->state = kMatchPrepare;
}
phase_ = kMatchLock; phase_ = kMatchLock;
phase_start_tick_ = a8::XGetTickCount(); phase_start_tick_ = a8::XGetTickCount();
countdown_ = MetaMgr::Instance()->match_lock_time; countdown_ = MetaMgr::Instance()->match_lock_time;