Commit Graph

22755 Commits

Author SHA1 Message Date
treeston
8d7ab10efa Scripts/SmartAI: Some clean-up work:
- NULL -> nullptr
- Rename "AssistPlayerInCombat(who)" to "AssistPlayerInCombatAgainst(who)" to reflect what the method actually does
- Code style

No functionality was changed.

(cherry picked from commit 152b3ad5b9)

# Conflicts:
#	src/server/game/AI/SmartScripts/SmartAI.cpp
#	src/server/game/AI/SmartScripts/SmartScript.cpp
2017-02-11 22:34:59 +01:00
treeston
d176be59b8 ScriptedAI/Creature: Fix a bug where a std::chrono overload was counting milliseconds instead of seconds.
(cherry picked from commit 4030e4d780)
2017-02-11 22:03:16 +01:00
jackpoz
a3384bdc70 Scripts/Commands: Change "server shutdown" behavior
Change "server shutdown 0" behavior to delay the shutdown by the force threshold specified in configs if there are still players connected, set to 30 by default

(cherry picked from commit b37c7101de)
2017-02-11 22:02:08 +01:00
tkrokli
85a16fae3d Core/Scripts: move npc_kharan_mighthammer to DB/SAI
This PR affects the following 2 quests:
Quest ID 4001 "What Is Going On?" - part 2 (Horde)
Quest ID 4342 "Kharan's Tale" (Alliance)

Target of this PR:
Move core script npc_kharan_mighthammer to DB/SAI
(thereby removing 10 lines of hardcoded text).

* DB/conditions: extra gossip conditions

- added conditions for gossip before quest taken and after quest completed.
- removed redundant core script SAY_GET_ME_OUT_OF_HERE comment

* DB/creature: add more text to Kharan

- add all missing creature_text lines to entry 9021 Kharan Mighthammer
- add SAI duration to wait before TEXT_OVER is triggered (3000 ms)

(cherry picked from commit 2125c12609)
2017-02-11 21:52:29 +01:00
jackpoz
6367be09fa Scripts/Commands: Change "server shutdown" behavior
Change "server shutdown" behavior to always include [force] optional parameter when issued from local or remote console.

(cherry picked from commit 884736b3b2)
2017-02-11 21:43:03 +01:00
treeston
a0d886020d Core/Spells: Check TRIGGERED_DONT_REPORT_CAST_ERROR flag in SendCastResult rather than CheckCast.
Fixes and closes #16836.

(cherry picked from commit 4b15369378)

# Conflicts:
#	src/server/game/Spells/Spell.cpp
2017-02-11 21:37:42 +01:00
Aokromes
3b67401f6a Update boss_jedoga_shadowseeker.cpp
(cherry picked from commit 153b797182)
2017-02-11 21:37:42 +01:00
ariel-
9c0f2c4945 Core/PvP: Gameobject rotation in BGs and Wintergrasp.
- Add a workaround in BattleGround correcting for bad rotations in BG scripts
- Calculate rotation from rotation in Wintergrasp, this function hasn't a rotation parameter and should be added in the future.
- Also removed an ugly hardcode in Battlefield::SpawnGameObject

Closes #17711

(cherry picked from commit 33fbc453d2)

# Conflicts:
#	src/server/game/Battlefield/Battlefield.cpp
#	src/server/game/Battlegrounds/Battleground.cpp
2017-02-11 21:37:40 +01:00
jackpoz
af11f48356 Core/Group: Do not allow a player to invite himself
Do not allow a player to invite himself in group.
Fix an edge case when inviting another player that would cause a crash.
Fix #17664

(cherry picked from commit bcfa47c051)
2017-02-11 21:37:40 +01:00
Aokromes
6326bf20f5 Core/Chat: Split ChatLevelReq.Say into 3
ChatLevelReq.Say
ChatLevelReq.Emote
ChatLevelReq.Yell

(cherry picked from commit cf8276845d)

# Conflicts:
#	src/server/game/Handlers/ChatHandler.cpp
2017-02-11 21:11:37 +01:00
ariel-
41fad95ad8 Core/Battlegrounds: do not teleport GMs if out of bounds before starting
(cherry picked from commit 80a463bccb)
2017-02-11 21:09:01 +01:00
Aokromes
5264374fd6 Core/Player: New PartyLevelReq setting (#17707)
(cherry picked from commit bfda0ba91d)

Typo fix
(cherry picked from commit 35f06ccb55)
2017-02-11 21:08:48 +01:00
ariel-
04f7de8957 Core/Spells: Abyssal Shatter should have a chance to skill up
(cherry picked from commit 0d91ccf6bd)
2017-02-11 20:59:21 +01:00
Keader
46d6b1a995 Core/Scripts Shade of Akama Rewrite (#17567)
(cherry picked from commit afaaedad2d)

Rename 9955_22_55_world.sql to 2016_08_01_01_world.sql
(cherry picked from commit 1f8c55d1d6)
2017-02-11 20:57:40 +01:00
Aokromes
3b9efd35df Core/PVP: Move report AFK requirement to config (#17699)
(cherry picked from commit 633264f58f)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/World/World.cpp
2017-02-11 20:55:14 +01:00
tkrokli
9c09a0bd75 Core/Scripts: Remove useless SD2 error log (#17691)
* Core/Scripts:  Remove useless log message (ref. joschiwald)

(cherry picked from commit 8fdb9b4579)
2017-02-11 20:51:21 +01:00
ariel-
eb6ecb99e6 Update BattleGroundHandler.cpp
(cherry picked from commit dff18152fc)
2017-02-11 20:51:03 +01:00
Aokromes
a7aae1f178 Core/PVP: Improve log (#17698)
(cherry picked from commit ea4e7fec01)
2017-02-11 20:50:39 +01:00
ariel-
c429e7d489 Core/Entities: debloat SummonGameObject parameter list using proper wrappers and enable GO rotation in scripts
- There's still an overload allowing for x, y, z, o to be passed directly
- Fixed default animstate for GameObject creation in many places, it should be 255, not 100 (checked in sniffs)

(cherry picked from commit 62bfee37cb)

# Conflicts:
#	src/server/game/Battlefield/Battlefield.cpp
#	src/server/game/Battlegrounds/Battleground.cpp
#	src/server/game/Entities/GameObject/GameObject.cpp
#	src/server/game/Entities/GameObject/GameObject.h
#	src/server/game/Entities/Object/Object.cpp
#	src/server/game/Entities/Object/Object.h
#	src/server/game/Spells/SpellEffects.cpp
#	src/server/scripts/Commands/cs_gobject.cpp
#	src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
#	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
#	src/server/scripts/Kalimdor/zone_feralas.cpp
#	src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
#	src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
#	src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
2017-02-11 20:50:29 +01:00
ariel-
02cef6f034 Core/GameObjects: Gameobject rotation (from cmangos/mangos-wotlk@2bcbc0f) (#14146)
cmangos/mangos-wotlk@0fe88f35df: [11531] Normalize gameobject's quaternion, thanks to zergtmn for pointing
cmangos/mangos-wotlk@060dfb791b: [11667] Implement transport path rotation
cmangos/mangos-wotlk@565f52c6c1: [11806] A bit gameobject code refactoring
cmangos/mangos-wotlk@6874951: [11807] Add gameobject_addon table

Closes #14146

(cherry picked from commit 2967bf59b4)

# Conflicts:
#	src/server/game/Battlefield/Battlefield.cpp
#	src/server/game/Battlegrounds/Battleground.cpp
#	src/server/game/Entities/GameObject/GameObject.cpp
#	src/server/game/Entities/GameObject/GameObject.h
#	src/server/game/Entities/Object/Object.cpp
#	src/server/game/Globals/ObjectMgr.cpp
#	src/server/game/Spells/SpellEffects.cpp
#	src/server/scripts/Commands/cs_gobject.cpp
#	src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
#	src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
2017-02-11 19:10:43 +01:00
ariel-
07f2f37329 Core/Spell: fix one logic fail when calculating level penalty
(http://wow.gamepedia.com/index.php?title=Spell_power&oldid=1751770#Spells_learned_before_level_20)

(cherry picked from commit c271e196c8)
2017-02-11 17:58:59 +01:00
tkrokli
d40dd1f639 Core/Scripts: zone_silithus.cpp cleanup (#17165)
- move npcs_rutgar_and_frankal to DB/SAI
- move hardcoded text from go_wind_stone to DB
- additional enum cleanup in zone_silithus.cpp
- also solves a $r issue in SAY_TEMPLAR_AGGRO
(cherry picked from commit b7abaed199)

# Conflicts:
#	src/server/scripts/Kalimdor/zone_silithus.cpp
2017-02-11 17:50:06 +01:00
Nyeriah
9db8ae1654 Scripts/Karazhan: Rework Attumen the Huntsman's script
Change log:
- Timers are more accurate
- Corrected Charge ability ID based on 6.x researches
- Added Midnight's missing emotes
- Fixed issue with instance being stuck in combat in case of wipes
- Solved the rare scenario where Attumen would be summoned multiple times
- Visual spell on 3rd phase transition added
- Attumen and Midnight can now be damaged during 3rd phase transition
- Midnight calls for the aid of every horse still alive in the stables
- Use proper spells to summon Attumen and handle transitions
- Now despawns on evade
Video of encounter after changes: https://www.youtube.com/watch?v=KX0rqaBeSzw
(cherry picked from commit 4c4d92faa3)

Scripts/Karazhan: Fix a warning
(cherry picked from commit 0cc33b5a42)

Scripts/Karazhan: Register Midnight's summons

* Solves issue with bosses not despawning after encounter
(cherry picked from commit 2d0fa2d020)
2017-02-11 17:17:38 +01:00
Keader
5978e90722 Core/Scripts Added Black Temple Boundaries (#17579)
* Core/Scripts Added Black Temple Boundaries
(cherry picked from commit 2710c655ff)

# Conflicts:
#	src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
2017-02-11 17:00:29 +01:00
treeston
e30cbb960e Core/Spell: Quick readability change. Functionality not altered.
(cherry picked from commit 03bef35500)

# Conflicts:
#	src/server/game/Spells/Spell.cpp
2017-02-11 16:59:44 +01:00
ariel-
3532173ee3 Core/Vehicle: delay position update in Vehicles, this may be deleted on UpdatePosition, generating a crash
Closes #17634

(cherry picked from commit 6b3067f978)

# Conflicts:
#	src/server/game/Entities/Vehicle/Vehicle.cpp
2017-02-11 16:56:07 +01:00
Killyana
611bc7d838 Core/Entities: Remove wrong immunity
Closes #17363

(cherry picked from commit 0be0606593)
2017-02-11 16:49:56 +01:00
ariel-
781891a857 Core/Handlers: actually check allowed trainer classes and races to avoid spoofing
Closes #14586

(cherry picked from commit f87f7619aa)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Handlers/NPCHandler.cpp
2017-02-11 16:39:45 +01:00
ariel-
e56633dbd9 Update ItemPrototype.cpp, codestyle and indentation cleanup
(cherry picked from commit a6005d98e7)

# Conflicts:
#	src/server/game/Entities/Item/ItemPrototype.cpp
2017-02-11 15:57:08 +01:00
ariel-
c827443d4a Core/Player: Misc codestyle
(cherry picked from commit bdbd5b0961)
2017-02-11 15:49:32 +01:00
ForesterDev
19df05d86d Core/UnitAI: Removed unneccessary null checks in SpellTargetSelector. CID 1357405 (#17630)
(cherry picked from commit a2495002e5)

# Conflicts:
#	src/server/game/AI/CoreAI/UnitAI.cpp
2017-02-11 15:34:48 +01:00
ForesterDev
b65bb30090 Core/Entities: add missing null pointer checks in HandleProcTriggerSpell. CID 1356245 (#17629)
(cherry picked from commit 22c4e87ebb)

# Conflicts:
#	src/server/game/Entities/Unit/Unit.cpp
2017-02-11 15:30:51 +01:00
ForesterDev
97f65d9b4d Scripts / Naxxramas : add missing null pointer check. Fixes CID 1354738 (#17628)
(cherry picked from commit d57c177d0b)

# Conflicts:
#	src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
2017-02-11 15:29:22 +01:00
SnapperRy
13bac539d6 Core/Mail: implement a way to specify NPC sender for mails when they should be different from the quest ender (#17601)
(cherry picked from commit d4e15f1aac)

# Conflicts:
#	src/server/game/Quests/QuestDef.cpp
#	src/server/game/Quests/QuestDef.h

Rename 9999_99_99_99_world.sql to sql/updates/world/3.3.5/2016_07_19_00_world.sql
(cherry picked from commit 3a77dec6e6)
2017-02-11 15:19:42 +01:00
ariel-
8d45095e28 Core/Entities: implement SPELL_AURA_MOD_CRIT_CHANCE_FOR_CASTER, fixes talent Point of no Escape
(cherry picked from commit 2feb53ecb6)

# Conflicts:
#	src/server/game/Entities/Unit/Unit.cpp
#	src/server/game/Spells/Auras/SpellAuraDefines.h
#	src/server/game/Spells/Auras/SpellAuraEffects.cpp
2017-02-11 15:14:04 +01:00
Shauren
6f176c0980 Core/Spells: Fixed fishing
Closes #19016
2017-02-11 13:04:12 +01:00
Shauren
87513871dc Fixup pr e5e8537c3e 2017-02-11 11:46:55 +01:00
Marco Ebert
f055039f58 Fix non PCH build. Finally. 2017-02-11 10:05:47 +01:00
DoctorKraft
e5e8537c3e Core/Spells: Fixed Victory Rush
Closes #19044
2017-02-10 23:22:35 +01:00
edreisantafe
9ad50fb08c Core/Spells: Fixed Levitate
Closes #19091
2017-02-10 23:03:19 +01:00
Shauren
8453d7dae2 Core/Auras: Allow passive auras from items to stack 2017-02-09 18:53:55 +01:00
DoctorKraft
a692ebdcb0 Core/Spell: Conjure Refreshment (#19035) 2017-02-07 21:17:47 +01:00
joschiwald
0659a85436 Core/Entities: Fixed typo in AreaTrigger loading 2017-02-06 21:19:31 +01:00
joschiwald
e6b46f883b Core/Guilds: Addition to e0e0242cb3
* changed count type from uint32 to uint64
2017-02-06 19:26:47 +01:00
Shauren
a210c7ccf6 Core/Opcodes: Add missing handlers (for logging names mostly) 2017-02-06 17:23:39 +01:00
joschiwald
e0e0242cb3 Core/Guilds: Added log message about guild achievements on startup 2017-02-05 22:16:13 +01:00
joschiwald
e3d44a6497 Fixed build 2017-02-05 21:49:53 +01:00
ariel-
32fd993dd7 Core/Entities: Readded check removed in d7460887c8, caused flying ghost players to not move if they died during a root effect, root flag was never cleared clientside and impeded movement.
(cherry picked from commit ef85d01746)

# Conflicts:
#	src/server/game/Server/WorldSession.cpp
2017-02-05 21:23:29 +01:00
ariel-
635ea3258b Core/Loot: fix bug introduced in a49544cc18 in which creatures only having gold wouldn't show lootable sparks, and thus couldn't be looted
(cherry picked from commit 59f71f915a)
2017-02-05 21:14:22 +01:00
ccrs
297c0a9b9e Core/UnitAI: #17309 follow-up (#17608)
* Core/UnitAI: SelectTarget correction

Set CurrentVictim as first element on targetList if necessary, which is then filled with the threatlist elements that satisfy the predicate.
(cherry picked from commit b008b677ad)
2017-02-05 21:14:04 +01:00