From 091534dc6f665d47831212060918c3f3a7a7a292 Mon Sep 17 00:00:00 2001 From: Gacko Date: Sun, 12 Oct 2014 11:52:55 +0200 Subject: [PATCH 01/10] Rename SQL files. It's not November, yet. --- .../world/{2014_11_12_00_world.sql => 2014_10_12_00_world.sql} | 0 .../world/{2014_11_12_01_world.sql => 2014_10_12_01_world.sql} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename sql/updates/world/{2014_11_12_00_world.sql => 2014_10_12_00_world.sql} (100%) rename sql/updates/world/{2014_11_12_01_world.sql => 2014_10_12_01_world.sql} (100%) diff --git a/sql/updates/world/2014_11_12_00_world.sql b/sql/updates/world/2014_10_12_00_world.sql similarity index 100% rename from sql/updates/world/2014_11_12_00_world.sql rename to sql/updates/world/2014_10_12_00_world.sql diff --git a/sql/updates/world/2014_11_12_01_world.sql b/sql/updates/world/2014_10_12_01_world.sql similarity index 100% rename from sql/updates/world/2014_11_12_01_world.sql rename to sql/updates/world/2014_10_12_01_world.sql From a9cd76f101e655f13ad236e8b7097ac92d379a3a Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sun, 12 Oct 2014 19:02:22 +0200 Subject: [PATCH 02/10] DB/Spell: Delete no longer needed hack By unholychick --- sql/updates/world/2014_10_12_02_world.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2014_10_12_02_world.sql diff --git a/sql/updates/world/2014_10_12_02_world.sql b/sql/updates/world/2014_10_12_02_world.sql new file mode 100644 index 00000000000..42417c4602a --- /dev/null +++ b/sql/updates/world/2014_10_12_02_world.sql @@ -0,0 +1,2 @@ +-- +DELETE FROM `spell_dbc` WHERE `Id` = 100001; From bfc6044c666667955ee12fada57dcd84bc5e793a Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sun, 12 Oct 2014 19:07:27 +0200 Subject: [PATCH 03/10] DB/Spell: Do not let Ebon Plague stack from different casters Closes #12314 Updates #1818 By unholychick --- sql/updates/world/2014_10_12_03_world.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2014_10_12_03_world.sql diff --git a/sql/updates/world/2014_10_12_03_world.sql b/sql/updates/world/2014_10_12_03_world.sql new file mode 100644 index 00000000000..7f6649cd271 --- /dev/null +++ b/sql/updates/world/2014_10_12_03_world.sql @@ -0,0 +1,2 @@ +-- +UPDATE `spell_dbc` SET `AttributesEx3` = 0 WHERE `Id` = 65142; From 7449231ce1f7c4ffadabbcb480ae2f28e766c068 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sun, 12 Oct 2014 19:13:04 +0200 Subject: [PATCH 04/10] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 33fea30e36e..8f5219f52dd 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![Coverity Scan Build Status](https://scan.coverity.com/projects/435/badge.svg)](https://scan.coverity.com/projects/435) `3.3.5`: [![3.3.5 Build Status](https://travis-ci.org/TrinityCore/TrinityCore.svg?branch=master)](https://travis-ci.org/TrinityCore/TrinityCore) `4.3.4`: [![4.3.4 Build Status](https://travis-ci.org/TrinityCore/TrinityCore.svg?branch=4.3.4)](https://travis-ci.org/TrinityCore/TrinityCore) +[![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=1310)](https://www.bountysource.com/trackers/1310-trinity-core?utm_source=1310&utm_medium=shield&utm_campaign=TRACKER_BADGE) ## Introduction From 68293aa9b21877d62d2085bca32e43686e5ede4d Mon Sep 17 00:00:00 2001 From: Kittnz Date: Sun, 12 Oct 2014 19:23:40 +0200 Subject: [PATCH 05/10] Core/Misc: Fix current player state when logging out Sit should only be apply'd when player is standing. For example when sitting on a chair when logging out, player should stay on the chair until fully logged out and not sit on the floor. --- src/server/game/Handlers/MiscHandler.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index bede3b4323c..50fde106824 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -414,7 +414,8 @@ void WorldSession::HandleLogoutRequestOpcode(WorldPacket& /*recvData*/) // not set flags if player can't free move to prevent lost state at logout cancel if (GetPlayer()->CanFreeMove()) { - GetPlayer()->SetStandState(UNIT_STAND_STATE_SIT); + if (GetPlayer()->getStandState() == UNIT_STAND_STATE_STAND) + GetPlayer()->SetStandState(UNIT_STAND_STATE_SIT); WorldPacket data(SMSG_FORCE_MOVE_ROOT, (8+4)); // guess size data << GetPlayer()->GetPackGUID(); From 882cb2b32b8f22dc2eb77fcd5783e5afe4029120 Mon Sep 17 00:00:00 2001 From: Gacko Date: Sun, 12 Oct 2014 19:31:00 +0200 Subject: [PATCH 06/10] DB/SAI: Prevent endless loops with linked events --- sql/updates/world/2014_10_12_04_world.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2014_10_12_04_world.sql diff --git a/sql/updates/world/2014_10_12_04_world.sql b/sql/updates/world/2014_10_12_04_world.sql new file mode 100644 index 00000000000..b522b5fc927 --- /dev/null +++ b/sql/updates/world/2014_10_12_04_world.sql @@ -0,0 +1,3 @@ +UPDATE `smart_scripts` SET `link`=12 WHERE `entryorguid`=11680 AND `source_type`=0 AND `id`=11; +UPDATE `smart_scripts` SET `link`=2 WHERE `entryorguid`=18855 AND `source_type`=0 AND `id`=1; +UPDATE `smart_scripts` SET `link`=18 WHERE `entryorguid`=26670 AND `source_type`=0 AND `id`=18; From 2df0144714d8d77e83be2da3553643a88911a113 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sun, 12 Oct 2014 19:38:56 +0200 Subject: [PATCH 07/10] Revert bfc6044 --- sql/updates/world/2014_10_12_05_world.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2014_10_12_05_world.sql diff --git a/sql/updates/world/2014_10_12_05_world.sql b/sql/updates/world/2014_10_12_05_world.sql new file mode 100644 index 00000000000..8ea7ba0aea1 --- /dev/null +++ b/sql/updates/world/2014_10_12_05_world.sql @@ -0,0 +1,2 @@ +-- +UPDATE `spell_dbc` SET `AttributesEx3` = 128 WHERE `Id` = 65142; From 7252f11add985247d7ae5b8262d8f38e60bd8e33 Mon Sep 17 00:00:00 2001 From: Gacko Date: Sun, 12 Oct 2014 19:51:23 +0200 Subject: [PATCH 08/10] DB/Loot: Xandivious (15623) --- sql/updates/world/2014_10_12_06_world.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 sql/updates/world/2014_10_12_06_world.sql diff --git a/sql/updates/world/2014_10_12_06_world.sql b/sql/updates/world/2014_10_12_06_world.sql new file mode 100644 index 00000000000..c448e6cbd98 --- /dev/null +++ b/sql/updates/world/2014_10_12_06_world.sql @@ -0,0 +1,8 @@ +DELETE FROM `creature_loot_template` WHERE `Entry`=15623; +INSERT INTO `creature_loot_template`(`Entry`,`Item`,`Chance`,`MinCount`,`MaxCount`) VALUES +(15623,14047,19,1,4), +(15623,14256,3,1,1), +(15623,8952,2,1,1), +(15623,13446,1.3,1,1), +(15623,13443,0.3,1,1), +(15623,14283,0.11,1,1); From bb046ce4ed59708fa002f0b7399c1412e6b1de42 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sun, 12 Oct 2014 20:01:27 +0200 Subject: [PATCH 09/10] Core/Maps: Apply const-correctness to GridMap::loadData() --- src/server/game/Maps/Map.cpp | 2 +- src/server/game/Maps/Map.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 37563acd74a..7f350df2280 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -1586,7 +1586,7 @@ GridMap::~GridMap() unloadData(); } -bool GridMap::loadData(char* filename) +bool GridMap::loadData(const char* filename) { // Unload old data if exist unloadData(); diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 87434d555aa..e2e9fa1f706 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -200,7 +200,7 @@ class GridMap public: GridMap(); ~GridMap(); - bool loadData(char* filaname); + bool loadData(const char* filename); void unloadData(); uint16 getArea(float x, float y) const; From 9922063021c6d49798c42c3dcbb6c9572fbe19c9 Mon Sep 17 00:00:00 2001 From: Gacko Date: Sun, 12 Oct 2014 20:07:13 +0200 Subject: [PATCH 10/10] DB/Loot: Xandivious (15623) - forgot item 12002 Thanks @Aminxhm --- sql/updates/world/2014_10_12_07_world.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2014_10_12_07_world.sql diff --git a/sql/updates/world/2014_10_12_07_world.sql b/sql/updates/world/2014_10_12_07_world.sql new file mode 100644 index 00000000000..1bd0e4d9352 --- /dev/null +++ b/sql/updates/world/2014_10_12_07_world.sql @@ -0,0 +1,2 @@ +DELETE FROM `creature_loot_template` WHERE `Entry`=15623 AND `Item`=12002; +INSERT INTO `creature_loot_template`(`Entry`,`Item`,`Chance`,`MinCount`,`MaxCount`) VALUE (15623,12002,0.13,1,1);