yolinlin/azerothcore-wotlk-pbot
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2025-11-29 17:38:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'azerothcore:master' into Playerbot

Browse Source
This commit is contained in:
bash
2025-10-23 01:57:59 +02:00
committed by GitHub
parent 880529a5b4 2a78a1788f
commit 2607df754b
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/installer/includes/os_configs/windows.sh
View File

@@ -26,4 +26,4 @@ choco install -y --skip-checksums "${INSTALL_ARGS[@]}" cmake.install -y --insta
choco install -y --skip-checksums "${INSTALL_ARGS[@]}" visualstudio2022-workload-nativedesktop choco install -y --skip-checksums "${INSTALL_ARGS[@]}" visualstudio2022-workload-nativedesktop
choco install -y --skip-checksums "${INSTALL_ARGS[@]}" openssl --force --version=3.5.4 choco install -y --skip-checksums "${INSTALL_ARGS[@]}" openssl --force --version=3.5.4
choco install -y --skip-checksums "${INSTALL_ARGS[@]}" boost-msvc-14.3 --force --version=1.87.0 choco install -y --skip-checksums "${INSTALL_ARGS[@]}" boost-msvc-14.3 --force --version=1.87.0
choco install -y --skip-checksums "${INSTALL_ARGS[@]}" mysql --force --version=8.4.4 choco install -y --skip-checksums "${INSTALL_ARGS[@]}" mysql --force --version=8.4.6

4
data/sql/updates/db_world/2025_10_21_00.sql Normal file
View File

@@ -0,0 +1,4 @@
-- DB update 2025_10_19_00 -> 2025_10_21_00
-- Set Unit Flags (Persistence)
UPDATE `creature_template` SET `unit_flags` = `unit_flags` |256|512|33554432 WHERE (`entry` = 29863);

7
src/server/game/Entities/Object/Object.cpp
View File

@@ -1776,6 +1776,8 @@ bool WorldObject::CanSeeOrDetect(WorldObject const* obj, bool ignoreStealth, boo
WorldObject const* viewpoint = this; WorldObject const* viewpoint = this;
if (Player const* thisPlayer = ToPlayer()) if (Player const* thisPlayer = ToPlayer())
{ {
viewpoint = thisPlayer->GetSeer();
if (Creature const* creature = obj->ToCreature()) if (Creature const* creature = obj->ToCreature())
{ {
if (TempSummon const* tempSummon = creature->ToTempSummon()) if (TempSummon const* tempSummon = creature->ToTempSummon())
@@ -1815,14 +1817,9 @@ bool WorldObject::CanSeeOrDetect(WorldObject const* obj, bool ignoreStealth, boo
return false; return false;
} }
if (thisPlayer->GetViewpoint())
viewpoint = thisPlayer->GetViewpoint();
if (thisPlayer->GetFarSightDistance() && !thisPlayer->isInFront(obj)) if (thisPlayer->GetFarSightDistance() && !thisPlayer->isInFront(obj))
{
return false; return false;
} }
}
// Xinef: check reversely obj vs viewpoint, object could be a gameObject which overrides _IsWithinDist function to include gameobject size // Xinef: check reversely obj vs viewpoint, object could be a gameObject which overrides _IsWithinDist function to include gameobject size
if (!corpseCheck && !viewpoint->IsWithinDist(obj, GetSightRange(obj), false)) if (!corpseCheck && !viewpoint->IsWithinDist(obj, GetSightRange(obj), false))

1
src/server/game/Entities/Player/Player.h
View File

@@ -2343,6 +2343,7 @@ public:
void SetMover(Unit* target); void SetMover(Unit* target);
void SetSeer(WorldObject* target) { m_seer = target; } void SetSeer(WorldObject* target) { m_seer = target; }
WorldObject* GetSeer() const { return m_seer; }
void SetViewpoint(WorldObject* target, bool apply); void SetViewpoint(WorldObject* target, bool apply);
[[nodiscard]] WorldObject* GetViewpoint() const; [[nodiscard]] WorldObject* GetViewpoint() const;
void StopCastingCharm(Aura* except = nullptr); void StopCastingCharm(Aura* except = nullptr);

1
src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
View File

@@ -1220,6 +1220,7 @@ public:
if (Vehicle* v = me->GetVehicle()) if (Vehicle* v = me->GetVehicle())
v->RemoveAllPassengers(); v->RemoveAllPassengers();
if (killer)
if (Player* player = killer->GetCharmerOrOwnerPlayerOrPlayerItself()) if (Player* player = killer->GetCharmerOrOwnerPlayerOrPlayerItself())
player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GET_KILLING_BLOWS, 1, 0, me); player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GET_KILLING_BLOWS, 1, 0, me);
} }