Commit Graph
29917 Commits
Author SHA1 Message Date
jackpoz 308d30417c Core/Player: Fix crash related to vehicles
Fix assertion triggered when entering a vehicle while channelling a shared vision spell.
Fix #15953

(cherry picked from commit 2cb54d5606)
2016-01-11 01:51:42 -03:00
Naios 6b5817d4a6 Dep/CppFormat: Update cppformat to cppformat/cppformat@5c76d107cb
(cherry picked from commit aa3020c26d54fa63fde16c5a765b1d72649c7e30)
2016-01-11 01:51:39 -03:00
Shauren 89928cbdf0 Core/Items: Fixed a possible crash with soulbound tradable items
Closes #15700

(cherry picked from commit 094f505e404b5a4e4846657031f89ac44626a1f8)
(cherry picked from commit cc685ac334)
2016-01-11 01:51:35 -03:00
Shauren 7a5a4cb726 Core/Players: Check if player can enter the instance during login before trying to add him to map
* Fixes name displaying as "Unknown"

(cherry picked from commit 45994a177c128dc83ea01b0697377f7b74b5c4ba)
(cherry picked from commit c7bad70e55)

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
2016-01-11 01:51:32 -03:00
jackpoz 9fe26765b4 Core/Player: Always allow accounts with RBAC_PERM_COMMAND_GM to enter instances on login
Always allow accounts with RBAC_PERM_COMMAND_GM to enter instances on login even if player had .gm off .
Send an ingame message to notify the user about the avoided kick.

(cherry picked from commit 5f917e2286)

Conflicts:
	src/server/game/Entities/Player/Player.cpp
2016-01-11 01:51:28 -03:00
treeston 27f0edde0f Game/Maps: Instance handling follow-up:
- Fix a bug where a player could maintain a conflicting non-perm solo bind if they were in the instance when invited to group. Closes #16150.
- If a group is created while the leader is in an instance that nobody is bound to, the group will take over the instance and bind to it. This stops the homebind timer when reforming group after disconnects and the like.

(cherry picked from commit 0f0a51b87a)
2016-01-11 01:51:25 -03:00
treeston 94a5629949 Game/Maps: Clean up instance handling.
- Rename Map::CanEnter to Map::CannotEnter. Return value changed from boolean (true means player can enter) to enum Map::EnterState (CAN_ENTER=0 means player can enter, any other value is a reason for deny).
- Move hack-y player error messages from within Map::CanEnter to the function calling CanEnter as appropriate (primarily WorldSession::HandleAreaTriggerOpcode).
- Modify WorldSession::HandleAreaTriggerOpcode to properly revive the player upon touching the portal leading to the instance they died in even if they are currently unable to zone in. Fixes and closes #15758.
- Modify Player::LoadFromDB to properly spawn players in the instance they logged off in if possible. Fixes and closes #15561.
- Modify permanent save behavior to be blizzlike: Players can always enter an instance they are saved to (assuming there are no map constraints against it), but get a homebind timer if the instance is already in use.

(cherry picked from commit 43fa7d48a5)

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Maps/Map.cpp
	src/server/game/Maps/MapInstanced.cpp
	src/server/game/Miscellaneous/Language.h
2016-01-11 01:51:21 -03:00
Shauren 4a07a95c18 Core/Corpses: Fixed a possible crash adding bones to grid
Closes #15808

(cherry picked from commit ec1583df67605b7253a34dc5f153cdad5b16969e)
(cherry picked from commit 910fb00130)
2016-01-11 01:51:14 -03:00
MitchesD 100d847483 Core/PacketIO: fixed instance binding of gamemasters
(cherry picked from commit 231fb1d322bc1c91f9227d43d3ef672605232154)
(cherry picked from commit a968595977)
2016-01-11 01:51:11 -03:00
Shauren b215184cc0 Core/Corpses: Fixed a crash happening when a corpse is added to a grid that was not yet fully loaded
Closes #15684

(cherry picked from commit 8c9ea7782a)
2016-01-11 01:51:07 -03:00
Shauren ce7fc03930 Core/World: Store account id in CharacterInfo to reduce the amount of database queries
(cherry picked from commit aaaa1c34410c160c7b0382f5ecdb39fa01ba007c)
(cherry picked from commit 4a36850167)

Conflicts:
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/World/World.cpp
2016-01-11 01:51:04 -03:00
Shauren b7d37daa74 Core/Corpses: Fixed map crash happening during map unload when there are corpses inside
(cherry picked from commit 1d17475791)
2016-01-11 01:51:00 -03:00
Shauren fc9c587604 Core/Corpses: Fixed leaking bones
Ref #15765

(cherry picked from commit bd16520ecc91d827abae7f0447cc292fe9e843e9)

Conflicts:
	src/server/game/Entities/Corpse/Corpse.cpp
2016-01-11 01:50:56 -03:00
pete318 6664a3acc3 Change many uint32 to ObjectGuid::LowType in line with 6.x changes.
(cherry picked from commit b1032ed620)

Conflicts:
	src/server/game/AuctionHouse/AuctionHouseMgr.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/DynamicObject/DynamicObject.cpp
	src/server/game/Entities/DynamicObject/DynamicObject.h
	src/server/game/Entities/GameObject/GameObject.cpp
	src/server/game/Entities/GameObject/GameObject.h
	src/server/game/Entities/Object/ObjectGuid.h
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Pet/Pet.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Transport/Transport.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Guilds/GuildMgr.h
	src/server/game/Mails/Mail.h
	src/server/game/Maps/Map.cpp
	src/server/game/Maps/TransportMgr.cpp
	src/server/game/Maps/TransportMgr.h
	src/server/game/OutdoorPvP/OutdoorPvP.h
2016-01-11 01:50:53 -03:00
ariel- b20c9ae283 Corpses update: cd27fd38b93884797c094a82dc7beb0498e2f124 2016-01-11 01:50:49 -03:00
ariel- b3ea9fbbe5 Map local guids 6.x -> 4.3.4
Ported the following commits:
https://github.com/TrinityCore/TrinityCore/commit/ca83e14f8b141fab0a13e08f48fca6c1ace0c4c7
https://github.com/TrinityCore/TrinityCore/commit/ee1c1b97be4492ecabe8b15ea6323fc37e4eaa8c
https://github.com/TrinityCore/TrinityCore/commit/18e4ab6911468b829b0fc768e532a770263c3717
https://github.com/TrinityCore/TrinityCore/commit/bf37446b3c2ed73b4d3aa9e227d3eff5c53b378b
https://github.com/TrinityCore/TrinityCore/commit/cb854a2b7bb7bd96cf9c4d1daf3789f797bf4db8
2016-01-11 01:50:45 -03:00
ariel- 694c89d76d Fix crash in StormLib 2016-01-11 01:50:41 -03:00
pete318 6d04b6ecc6 Improved Auction house deposit handling.
Including the weird quirks.

Changes:
* Deposit caculated according to same rule as client. (detailed below). Should always match client deposit now
* Deposit for multiple auctions now only collected once. Deferred calculation of deposit until all auctions listed.

Deposit calculation is as follows:

Base deposit calculation = MSV x 15/75% (depending on AH). However this is not rounded. Case to int is used (so always round down)
The remainder is held in a float.
The base is then multiplied by number of items, and the time multiplier (x2 for 24 hour, x4 for 48 hour)
The nearest (no of items or lower) no of items when multiplied by the remainder that creates a whole number is then multiplied by the time multiplier (x1/x2/x4) and then added to deposit.

Example:

Item sell price 1s25. Deposit 18.75c (15% of 1s25). So base deposit = 18, remainder 0.75. Time 24h (x2) Item count 1 = 36c. Remainder = 0.75 (n) Min = 1s. Deposit 1s
Item sell price 1s25. Deposit 18.75c (15% of 1s25). So base deposit = 18, remainder 0.75. Time 24h (x2) Item count 2 = 72c. Remainder = 1.50 (n)  Min = 1s. Deposit 1s
Item sell price 1s25. Deposit 18.75c (15% of 1s25). So base deposit = 18, remainder 0.75. Time 24h (x2) Item count 3 = 108c. Remainder = 2.25 (n) Min = 1s. Deposit 1s08c
Item sell price 1s25. Deposit 18.75c (15% of 1s25). So base deposit = 18, remainder 0.75. Time 24h (x2) Item count 4 = 144c. Remainder = 3.00 (n) Min = 1s. Deposit 1s50c (144c + (3c * 2))

Horrible kludge, to re-create a very weird deposit method.

Closes #15674 (PR)
Closes #15643 (Issue)

(cherry picked from commit 0ac442f19f)

Conflicts:
	src/server/game/AuctionHouse/AuctionHouseMgr.h
2016-01-11 01:50:38 -03:00
pete318 c29fc4cbd9 Auction house changes:
- Stop storing guid for auctioneer.
 - Store instead house ID
 - No separate ID for various houses. Only Horde, Alliance and Neutral.
 - Removed non-needed faction checks.
 - Use enum for auction house IDs

NOTE: This will expire all current auctions and return item to player (or
award to high bidder) in order to prepare database for the changes.

(cherry-picked from commit 01ae5c4bf6)

Conflicts:
	sql/base/characters_database.sql
	src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
2016-01-11 01:50:35 -03:00
ariel- 7bd5dfe1b2 Update characters_database_conversor_335a_to_434.sql
- BLOB, TEXT, GEOMETRY or JSON column 'guids' can't have a default value
- Unknown column 'auctionhouse' in 'WHERE clause'
2016-01-11 01:50:31 -03:00
Duarte Duarte 8ef9ea9157 Merge pull request #16231 from ariel-/smartfix
Core/SmartScripts: Fix typo
2016-01-11 03:16:17 +00:00
ariel- b08038c8b6 Fix typo after dcb7082277 2016-01-10 23:38:57 -03:00
Aokromes 706b5625fe Merge branch 'findzmq' into '4.3.4'
Corrected issues with ZeroMQ and VS2015

Sync FindZMQ.cmake, also fix CMake unable to find ZeroMQ if Visual Studio 2015 is used.

See merge request !3
2016-01-10 21:51:09 +00:00
Dr-J a7f1df6061 DB/Misc: Call to Arms: The Plaguelands/Scarlet Diversions (3.3.5 Only)
http://www.wowhead.com/quest=5093/a-call-to-arms-the-plaguelands#comments All versions of this quest are meant to be optional breadcrumb quests to lead players to the bulwark to quest in Western Plaguelands, previously on tc you could not continue chain unless breadcrumb was taken first.
2016-01-10 19:24:49 +00:00
Killyana 614ae6cba9 DB: Game_tele to Emerald Dream
By @Helias
Closes #16131
2016-01-10 18:58:18 +01:00
Killyana 69d59885c4 DB/SAI: Fix the react state for Darkfallen Bloodbearer
Closes #16159
2016-01-10 15:21:07 +01:00
Killyana 2668258fe2 DB/SAI: Harvest Collector
Closes #16158
2016-01-10 14:48:31 +01:00
Killyana 4194309873 DB/Creature: Fix The Crippler unit_flags
Closes #16148
2016-01-10 14:13:24 +01:00
Killyana 70868ceee7 DB/SAI: Fix Windroc Matriarch script and text
By @Saben65 and @velinath
Closes #16215
2016-01-10 13:50:18 +01:00
jackpoz e59b4324b8 Merge pull request #15977 from tkrokli/landmine_knockback_achievement
Scripts/Spells: Mine Sweeper achievement
2016-01-09 23:19:09 +01:00
jackpoz 4191bb868a Scripts/ICC: Fix static analysis issue
Fix an issue reported by static analysis
2016-01-09 21:53:53 +01:00
velinath d87f504b53 Core/Scripts/DB: Migrate specially scripted taxi NPC's to SmartAI 2016-01-09 14:39:07 -05:00
Duarte Duarte bddf9ec6fe Merge pull request #16101 from NathanHandley/3.3.5
Updated AuctionHouseSeller to have item class stack control
2016-01-09 18:46:20 +00:00
jackpoz e138e094a9 Scripts/Commands: Modify ".setskill" command to target current Player by default 2016-01-09 18:37:17 +01:00
jackpoz b39216eed3 Merge pull request #16186 from ariel-/spellmodcharges
Core/Spells: Fix redundant mod charge drop and spell crit calc
2016-01-09 16:51:39 +01:00
ariel- 5723f54a44 Sync FindZMQ.cmake, also fix CMake unable to find ZeroMQ if Visual Studio 2015 is used. 2016-01-09 10:06:23 -03:00
jackpoz b1d0855624 Core/Spells: Fix static analysis issues and a crash
Fix confusing NULL checks in Raise Ally check cast.
Fix a crash in Raise Ally triggered by executing ".cast back 61999" command targeting a pet in raid while being dead.
2016-01-08 23:13:15 +01:00
Saben65 ad425f9f17 Scripts/Shadowmoon Valley: Dragonmaw Peon
Fixes issue where NPC does not attack, even when aggro'd.
Fixes #16210
Closes #16204
2016-01-08 22:19:56 +01:00
Killyana 6274caf6d2 DB/Creature: Remove a wrong spawn and fix Lunchbox react state
Closes #16198
2016-01-08 18:38:05 +01:00
Killyana fda2487270 DB/Creature: Skyguard Handler/Skyguard Nether Ray Waypoint
Closes #16197
By @Saben65
2016-01-08 18:11:27 +01:00
Killyana b47381715b DB: Fix a Typo 2016-01-08 16:37:53 +01:00
Killyana 3ab64796ab DB/Creature: Wyrmcaller Vile
Update #3541
Add missing spawns and scripts for visual stuff
2016-01-08 16:30:58 +01:00
Francesco Borzì 3e42d83e9c Merge pull request #16208 from ShinDarth/putricide-fix
[3.3.5] Scripts/ICC: Fixed Professor Putricide
2016-01-08 11:13:22 +01:00
ShinDarth b1a89943a2 Scripts/ICC: Fixed Professor Putricide
- closes https://github.com/TrinityCore/TrinityCore/issues/16207
2016-01-08 10:33:16 +01:00
ccrs e5d4005cc6 Core/Spells: Fixed Raise Ally
thx @Nayd for sniffs :)
thx @Shauren for helping to find all spell involved

* There is no implementation for stats update on Puppet class (only on Guardian) so same SummonProperty as Raise Dead Ghoul (non pet) is used.
(Default SummonProperties set category to SUMMON_CATEGORY_PUPPET)
* Override the Summon Effect to enable charm and stats scaling.
* PlayerAI is used to handle unaura on ghoul despawn or dead.
It's necessary due to the fact that all script hooks on ScriptedCreature are called on an unactive CreatureAI, resulting in creature being unable to handle unaura calls.
* Create UpdateAI call for Player class
* Stats scaling is based on forum and wowhead comments, they recall this ghoul as a copy of the other one (same stats).
* Spellscript for Ghoul spell Thrash

Closes #82
Closes #14830
2016-01-08 00:10:15 +01:00
Aokromes cabf159308 Merge branch 'free' into '4.3.4'
Replace missing delete data with dtFree

Ref: Mismatched free() / delete / delete []
 at 0x4C2A360: operator delete(void*) (vg_replace_malloc.c:507)
 by 0x21EF5B1: MMAP::MMapManager::UnloadPhaseTile(std::__detail::_Node_const_iterator<std::pair<unsigned int const, std::vector<unsigned int, std::allocator<unsigned int> > >, false, false>, int, int) (MMapManager.cpp:300)

See merge request !2
2016-01-07 22:57:52 +00:00
ariel 5bf4fd939b Replace missing delete data with dtFree
Ref: Mismatched free() / delete / delete []
 at 0x4C2A360: operator delete(void*) (vg_replace_malloc.c:507)
 by 0x21EF5B1: MMAP::MMapManager::UnloadPhaseTile(std::__detail::_Node_const_iterator<std::pair<unsigned int const, std::vector<unsigned int, std::allocator<unsigned int> > >, false, false>, int, int) (MMapManager.cpp:300)
2016-01-07 22:52:44 +00:00
treeston 91fa2154e8 Fix a spawndist start-up warning. 2016-01-07 21:17:32 +01:00
jackpoz 2a50ea5cf1 Merge pull request #16193 from Goatform/3.3.5
Core/GameObjects: Fixed an issue where traps were not redirected to Grounding Totem
2016-01-07 19:27:40 +01:00
Aokromes 6a4336034b DB/Misc: 3.3.5a fixes 2016-01-07 10:21:03 +01:00