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

Merge remote-tracking branch 'origin/master' into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Server/WorldSocket.cpp
This commit is contained in:
Nay
2013-02-09 20:33:30 +00:00
parent 943c866da9 985de41421
commit 984e1feadf
23 changed files with 101 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/updates/auth/2013_02_07_00_auth_account.sql Normal file
View File

@@ -0,0 +1,3 @@
UPDATE `account` SET `sessionkey`='';
ALTER TABLE `account`
CHANGE `sessionkey` `sessionkey` varchar(80) NOT NULL DEFAULT '' COMMENT 'Temporary storage of session key used to pass data from authserver to worldserver' AFTER `sha_pass_hash`;

1
sql/updates/auth/2013_02_08_00_auth_account.sql Normal file
View File

@@ -0,0 +1 @@
ALTER TABLE `account` CHANGE `sessionkey` `sessionkey` varchar(80) NOT NULL DEFAULT '' AFTER `sha_pass_hash`;

8
sql/updates/world/2013_02_07_00_world_areatrigger_teleport.sql Normal file
View File

@@ -0,0 +1,8 @@
DELETE FROM `areatrigger_teleport` WHERE `id` IN (2406, 2407, 2408, 2409, 2410, 2411);
INSERT INTO `areatrigger_teleport` (`id`, `target_map`, `target_position_x`, `target_position_y`, `target_position_z`, `target_orientation`, `name`) VALUES
(2406, 0, -276.241, 1652.68, 77.5589, 3.14159, 'Shadowfang - South Fall Target'),
(2407, 0, -276.241, 1652.68, 77.5589, 3.14159, 'Shadowfang - South Fall Target'),
(2408, 0, -225.34, 1556.53, 93.0454, 4.71239, 'Shadowfang Front Fall Exit Target'),
(2409, 0, -225.34, 1556.53, 93.0454, 4.71239, 'Shadowfang Front Fall Exit Target'),
(2410, 0, -181.26, 1580.65, 97.4466, 6.28319, 'Shadowfang - North Fall Target'),
(2411, 0, -181.26, 1580.65, 97.4466, 6.28319, 'Shadowfang - North Fall Target');

10
sql/updates/world/2013_02_09_00_world_gameobject.sql Normal file
View File

@@ -0,0 +1,10 @@
SET @GUID = 4522;
SET @SINK = 300177;
-- spawn TEMP South Sinkhole
DELETE FROM `gameobject` WHERE `guid`=@GUID AND `id`=@SINK;
INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES
(@GUID, @SINK, 571, 1, 1, 3488.48, 4515.98, -20.7394, 5.34436, 0, 0, 0.452361, -0.891835, 300, 0, 1);
-- increase TEMP South Sinkhole spellfocus radius
UPDATE `gameobject_template` SET `data1`=20 WHERE `entry`=@SINK;