Commit Graph

228 Commits

Author SHA1 Message Date
郑佩茹
a44c241430 Merge branch 'master' into Playerbot
# Conflicts:
#	src/server/apps/worldserver/worldserver.conf.dist
#	src/server/game/Battlegrounds/Battleground.h
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/World/World.cpp
2022-07-13 10:31:30 -06:00
UltraNix
346150c92a fix(Scripts/ZulGurub): Hakkar's Blood Siphon (#12196) 2022-07-09 11:05:09 -03:00
Skjalf
32ba21d029 feat(Core/Scripting): Implement OnAllowedForPlayerLootCheck() hook (#12316)
* feat(Core/Scripting): Implement OnAllowedForPlayerLootCheck() hook

* reverse logic
2022-07-09 00:10:04 -03:00
UltraNix
c3d8340e6b fix(Core/Gossips): Properly send packet with questgiver query handler. (#12290)
Fixes #12215
2022-07-06 09:05:45 -03:00
Skjalf
16f2983307 fix(Scripts/ZulGurub): Thekal improvements (#12238)
* fix(Scripts/ZulGurub): Thekal improvements

* Update boss_thekal.cpp
2022-07-02 13:37:56 -03:00
ZhengPeiRu21
65f6fbb496 Merge branch 'azerothcore:master' into Playerbot 2022-06-27 09:06:46 -06:00
Skjalf
46789d5df6 fix(Scripts/BlackwingLair): Correct Bone Constructs abilities (#12180) 2022-06-26 04:45:15 -03:00
郑佩茹
67e9f2fd35 Fix merge conflicts 2022-06-21 13:24:33 -06:00
郑佩茹
87fc81d0cc Merge branch 'master' of https://github.com/ZhengPeiRu21/azerothcore-wotlk into Playerbot 2022-06-21 09:19:50 -06:00
Skjalf
ed7622b028 feat(Core/Formations): Implement GROUP_AI_FLAG_DONT_RESPAWN_LEADER_ON… (#12128) 2022-06-21 07:07:41 -03:00
UltraNix
a935e51754 fix(Core/Pets): Mob "soloed" by pet should not grant exp/loot to its … (#11969)
* fix(Core/Pets): Mob "soloed" by pet should not grant exp/loot to its master.

Fixes #11528
2022-06-19 07:46:23 -04:00
Maelthyr
d928d8d96a refactor(Core/Unit): PC&NPC Immunity (#11986)
* initial

* refactor(Core/Unit): PC & NPC Immunities

Cherry-pick TC: 74af880217

Co-authored-by: Treeston <treeston.nmoc@gmail.com>

* fix builds error

Cherry-pick TC: 74af880217

Co-authored-by: Treeston <treeston.nmoc@gmail.com>

* Fix nef combat, and replace SetFlag by SetUnitFlag

* fix combat with jedoga

Co-authored-by: Treeston <treeston.nmoc@gmail.com>
2022-06-18 08:16:45 -04:00
ZhengPeiRu21
3ab6d3cb37 Merge branch 'azerothcore:master' into Playerbot 2022-06-16 10:04:30 -06:00
UltraNix
117a18c961 fix(Scripts/ZulGurub): Renataki - improvements: (#11967)
Added missing spells and events.
Removed invalid spells
Corrected event timers
Fixes #11620
Fixes #11621
2022-06-16 11:39:09 -03:00
Maelthyr
32334f5f14 refactor(Core/Unit): minor changes for the combat system (#11904)
Cherry-pick from TC: https://github.com/TrinityCore/TrinityCore/pull/19966

Co-authored-by: Treeston <treeston.nmoc@gmail.com>
2022-06-13 19:40:29 -03:00
ZhengPeiRu21
d8a2665867 Merge branch 'azerothcore:master' into Playerbot 2022-06-08 11:10:38 -06:00
Skjalf
5c7e7afade fix(Scripts/ZulGurub): Rewrite High Priest Thekal (#11784) 2022-06-06 09:35:48 -03:00
ZhengPeiRu21
34b332b51b Merge branch 'azerothcore:master' into Playerbot 2022-05-19 12:55:28 -06:00
Maelthyr
c5368816fa Core/Combat: rename getThreatMgr() to GetThreatMgr() (#11758) 2022-05-18 05:36:57 -03:00
ZhengPeiRu21
cc94955bb2 Merge branch 'azerothcore:master' into Playerbot 2022-05-17 11:00:13 -06:00
UltraNix
4675f21867 fix(Core): Crashfix. (#11741) 2022-05-17 06:37:48 +02:00
ZhengPeiRu21
0053ac67d9 Merge branch 'azerothcore:master' into Playerbot 2022-05-10 08:46:47 -06:00
UltraNix
aeb260c3cc fix(Core/Guardian): Crashfix. (#11659) 2022-05-07 10:35:19 +02:00
ZhengPeiRu21
c2efd301b5 Merge branch 'azerothcore:master' into Playerbot 2022-05-06 16:13:01 -06:00
Tralenor
6cf82e3bd6 feat(Core/DB): Add Hooks On creature/game object save to db (#11246)
* implement OnCreatureSaveToDB and OnGameObjectSaveToDB Hooks

* fix Whitespaces in ScriptMgr.h

Co-authored-by: Timothée Moos <t1997.m@gmx.net>
2022-05-06 00:42:49 -03:00
郑佩茹
0326d8576d Merge branch 'master' into Playerbot
# Conflicts:
#	src/server/game/World/IWorld.h
#	src/server/game/World/World.cpp
#	src/server/game/World/World.h
#	src/server/scripts/Commands/cs_server.cpp
2022-05-02 16:39:21 -06:00
UltraNix
8900cab657 fix(Core/Minions): Crashfix. (#11592) 2022-05-01 10:28:20 +02:00
ZhengPeiRu21
84b794ab38 Merge branch 'azerothcore:master' into Playerbot 2022-04-25 08:58:13 -06:00
UltraNix
54ebdfcfc1 fix(Core/Formations): Implemented GROUP_AI_FLAG_RESPAWN_ON_EVADE flag. (#11512)
Fixes #11364
2022-04-25 09:24:46 -03:00
Skjalf
d8d0d5a5e4 feat(Core/Creature): Implement ModifyThreatPercentTemp() function (#11521)
* feat(Core/Creature): Implement ModifyThreatTemporary function

* feat(Core/Creature): Implement ModifyThreatPercentTemp() function

* fix build
2022-04-24 22:48:37 -03:00
Kitzunu
c55c4aa015 feat(Core/Creature): CREATURE_FLAG_EXTRA_MODULE (#11445)
* feat(Core/Creature): CREATURE_FLAG_EXTRA_MODULE

* Update CreatureData.h

* Update CreatureData.h

* Update CreatureData.h

* Update enuminfo_CreatureData.cpp

* Update enuminfo_CreatureData.cpp

* Update enuminfo_CreatureData.cpp

Co-authored-by: Skjalf <47818697+Nyeriah@users.noreply.github.com>
2022-04-23 16:22:17 +02:00
ZhengPeiRu21
8b0ef0b5a0 Merge branch 'azerothcore:master' into Playerbot 2022-04-22 09:13:49 -06:00
acidmanifesto
4ec69ba3ed fix (core): inhabit CanSwim revert (#11475) 2022-04-22 09:34:37 -04:00
ZhengPeiRu21
534df7c448 Merge branch 'azerothcore:master' into Playerbot 2022-04-17 17:59:20 -06:00
acidmanifesto
93a8d4fb63 fix (core) Remove not need operator || (#11425)
Since the mysterous why things evade in shallow water root issue was finally determined because of our shallow water calculations was wrong that was corrected by pr https://github.com/azerothcore/azerothcore-wotlk/pull/11419 we can now remove this operator
2022-04-17 13:24:15 -04:00
ZhengPeiRu21
ec96415fda Merge branch 'azerothcore:master' into Playerbot 2022-04-16 21:41:45 -06:00
IntelligentQuantum
ab4ee71762 feat(Core/Maps): AreaBoundary (#10525)
* cherry-picked commit (2da458c56d)
2022-04-15 14:10:41 +02:00
ZhengPeiRu21
2cb590a48b Merge branch 'azerothcore:master' into Playerbot 2022-04-07 08:55:50 -06:00
Kitzunu
edb7cac19b feat(Core/Unit): NPCFlags helpers (#11286)
* cherry-pick commit (TrinityCore/TrinityCore@d611925)
Co-Authored-By: Shauren <shauren.trinity@gmail.com>
2022-04-05 13:52:42 +02:00
ZhengPeiRu21
68d3ec7d77 Merge branch 'azerothcore:master' into Playerbot 2022-04-04 07:53:51 -06:00
UltraNix
ff654397e8 fix(Core/Creatures): Properly reset encounter if boss despawns on evade. (#11251)
Fixes #8167
2022-04-02 11:46:27 -03:00
ZhengPeiRu21
a25c289a5a Merge branch 'azerothcore:master' into Playerbot 2022-04-01 08:30:15 -06:00
Kitzunu
535c7451a2 feat(Core/Unit): New helpers for DynamicFlags (#11230)
* feat(Core/Unit): New helpers for DynamicFlags

* cherry-pick commit (d611925dc7)

Co-Authored-By: Shauren <shauren.trinity@gmail.com>

* oopsie

Co-authored-by: Shauren <shauren.trinity@gmail.com>
2022-04-01 07:14:29 -03:00
ZhengPeiRu21
32dc06900c Merge branch 'azerothcore:master' into Playerbot 2022-03-30 09:53:52 -06:00
Kitzunu
856aed6fc6 feat(Core/Unit): New helpers for UnitFlag and UnitFlag2 (#11227) 2022-03-30 07:59:42 -03:00
ZhengPeiRu21
246e2cad2e Merge branch 'azerothcore:master' into Playerbot 2022-03-24 08:28:09 -06:00
Skjalf
7377c96cc8 fix(Scripts/BlackwingLair): Razorgore improvements (#10971)
- Rewrite reset events
- Use proper healing spell on phase transition
- Now uses abilities during phase 1
- Phase transition scripted - mobs now run away
2022-03-23 15:42:34 -03:00
郑佩茹
d4062269c8 Merge branch 'master' into Playerbot 2022-03-22 10:53:26 -06:00
郑佩茹
db71f4739c Fix corrupt item cache crashes, bot whispers, trade crashes 2022-03-22 10:51:50 -06:00
acidmanifesto
77f13636b7 fix (core) Script Names not loaded with manual add (#11102)
This fixes Script names not being loaded with npcs and gameobjects when manually added with the .npc\gameobject add cmd that would lead the user to restart the server to load up the npc\gameobject with the script that was manually added
2022-03-22 09:49:06 -04:00