Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Handlers/MiscHandler.cpp
This commit is contained in:
Vincent-Michael
2014-10-12 21:46:40 +02:00
parent cf521de9cb a96ff6043d
commit 42f5017261
12 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -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

0
sql/updates/world/2014_11_12_00_world.sql → sql/updates/world/2014_10_12_00_world.sql
View File

0
sql/updates/world/2014_11_12_01_world.sql → sql/updates/world/2014_10_12_01_world.sql
View File

2
sql/updates/world/2014_10_12_02_world.sql Normal file
View File

@@ -0,0 +1,2 @@
--
DELETE FROM `spell_dbc` WHERE `Id` = 100001;

2
sql/updates/world/2014_10_12_03_world.sql Normal file
View File

@@ -0,0 +1,2 @@
--
UPDATE `spell_dbc` SET `AttributesEx3` = 0 WHERE `Id` = 65142;

3
sql/updates/world/2014_10_12_04_world.sql Normal file
View File

@@ -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;

2
sql/updates/world/2014_10_12_05_world.sql Normal file
View File

@@ -0,0 +1,2 @@
--
UPDATE `spell_dbc` SET `AttributesEx3` = 128 WHERE `Id` = 65142;

8
sql/updates/world/2014_10_12_06_world.sql Normal file
View File

@@ -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);

2
sql/updates/world/2014_10_12_07_world.sql Normal file
View File

@@ -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);

3
src/server/game/Handlers/MiscHandler.cpp
View File

@@ -415,7 +415,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);
GetPlayer()->SetRooted(true);
GetPlayer()->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
}

2
src/server/game/Maps/Map.cpp
View File

@@ -1586,7 +1586,7 @@ GridMap::~GridMap()
unloadData();
}
bool GridMap::loadData(char* filename)
bool GridMap::loadData(const char* filename)
{
// Unload old data if exist
unloadData();

2
src/server/game/Maps/Map.h
View File

@@ -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;