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 2024-09-12 15:50:23 +08:00
parent c267859f55
commit d9f7926f14
4 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/gameserver/buff/hide.cc
View File

@ -68,6 +68,15 @@ void HideBuff::Deactivate()
if (meta->_int_buff_param6 > 0) { if (meta->_int_buff_param6 > 0) {
owner->GetAbility()->DecSwitch(kHideBuffAimingShow); owner->GetAbility()->DecSwitch(kHideBuffAimingShow);
} }
#if 0
if (!owner->nature_recover_hp_idle_timer.expired()) {
owner->room->xtimer.FireEvent
(
owner->nature_recover_hp_idle_timer,
kRemoveNatureRecoverTimerEvent,
nullptr);
}
#endif
} }
void HideBuff::AddInRangeObject(Creature* target) void HideBuff::AddInRangeObject(Creature* target)

10
server/gameserver/buff/turnover.cc
View File

@ -41,15 +41,7 @@ void TurnOverBuff::Activate()
})); }));
#endif #endif
App::Instance()->verify_set_pos = 1; App::Instance()->verify_set_pos = 1;
if (owner->IsClientMove()) { owner->SpecDirMove(caster_.Get()->context_dir, distance, kNormalReason);
owner->SetMoveDir(caster_.Get()->context_dir);
Position pos;
pos.FromGlmVec3(*caster_.Get()->GetClientCurrPos());
owner->SetPos(pos);
owner->ForwardMove(distance, kTrunOverReason);
} else {
owner->ForwardMove(distance, kNormalReason);
}
App::Instance()->verify_set_pos = 0; App::Instance()->verify_set_pos = 0;
owner->SetMoveDir(old_dir); owner->SetMoveDir(old_dir);
if (phase->phase_param2.GetInt() == 1) { if (phase->phase_param2.GetInt() == 1) {

9
server/gameserver/creature.cc
View File

@ -978,6 +978,15 @@ void Creature::DoSkill(int skill_id,
} }
Skill* skill = GetSkill(skill_id); Skill* skill = GetSkill(skill_id);
if (skill && CanUseSkill(skill_id)) { if (skill && CanUseSkill(skill_id)) {
#if 1
{
App::Instance()->verify_set_pos = 1;
Position pos;
pos.FromGlmVec3(*GetClientCurrPos());
SetPos(pos);
App::Instance()->verify_set_pos = 0;
}
#endif
#ifdef MYDEBUG #ifdef MYDEBUG
if (IsPlayer()) { if (IsPlayer()) {
a8::XPrintf("DoSkill skill_id:%d a\n", {skill_id}); a8::XPrintf("DoSkill skill_id:%d a\n", {skill_id});

6
server/gameserver/movement.cc
View File

@ -346,6 +346,11 @@ bool Movement::MoveToPos(const glm::vec3& target_pos)
owner_->room->map_instance->Scale(end); owner_->room->map_instance->Scale(end);
bool ret = owner_->room->map_instance->RaycastEx(start, end, hit_point, hit_result, bool ret = owner_->room->map_instance->RaycastEx(start, end, hit_point, hit_result,
point.same_polys_flags, point.spec_polys, exclude_flags); point.same_polys_flags, point.spec_polys, exclude_flags);
#if 1
ret = true;
hit_point = target_pos;
point.tar_pos.FromGlmVec3(hit_point);
#else
if (ret) { if (ret) {
owner_->room->map_instance->UnScale(hit_point); owner_->room->map_instance->UnScale(hit_point);
point.tar_pos.FromGlmVec3(hit_point); point.tar_pos.FromGlmVec3(hit_point);
@ -359,6 +364,7 @@ bool Movement::MoveToPos(const glm::vec3& target_pos)
abort(); abort();
#endif #endif
} }
#endif
} }
point.distance = owner_->GetPos().Distance2D2(point.tar_pos); point.distance = owner_->GetPos().Distance2D2(point.tar_pos);
point.src_pos = owner_->GetPos(); point.src_pos = owner_->GetPos();