Skip to content

Commit 97fbf8f

Browse files
author
Github Actions
committed
Merge 3.3.5-base_patch to 3.3.5-passive_anticheat
2 parents ad4c340 + 002054c commit 97fbf8f

File tree

12 files changed

+2462
-9
lines changed

12 files changed

+2462
-9
lines changed

‎sql/updates/world/3.3.5/2024_10_24_00_world.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-- The World Tree and the Emerald Dream book update
2+
UPDATE `gameobject` SET `position_x` = -8729.36328125, `position_y` = 1107.6275634765625, `position_z` = 94.32956695556640625, `orientation` = 5.532694816589355468, `rotation2` = -0.3665008544921875, `rotation3` = 0.93041771650314331, `state` = 1 WHERE `guid` = 42903;

‎sql/updates/world/3.3.5/2024_10_24_01_world.sql‎

Lines changed: 446 additions & 0 deletions
Large diffs are not rendered by default.

‎sql/updates/world/3.3.5/2024_10_24_02_world.sql‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
--
2+
SET @CGUID := 147290;
3+
SET @POOLID := 593;
4+
5+
DELETE FROM `creature` WHERE `guid` BETWEEN @CGUID AND @CGUID+50;
6+
INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `StringId`, `VerifiedBuild`) VALUES
7+
(@CGUID, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2978.1, 6172.02, 60.9706, 5.32325, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
8+
(@CGUID+1, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2945.24, 6246.11, 60.975, 6.16101, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
9+
(@CGUID+2, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2957.58, 6227.22, 60.7323, 3.94444, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
10+
(@CGUID+3, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2926.58, 6281.96, 62.1978, 0.802851, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
11+
(@CGUID+4, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2887.59, 6237.46, 77.7758, 3.85718, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
12+
(@CGUID+5, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2867.71, 6267.31, 61.747, 4.99164, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
13+
(@CGUID+6, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2854.76, 6246.98, 77.7758, 3.35103, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
14+
(@CGUID+7, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2905.47, 6216.61, 61.5561, 5.3058, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
15+
(@CGUID+8, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2928.38, 6185.37, 62.5468, 1.91986, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
16+
(@CGUID+9, 25284, 571, 3537, 4129, 1, 1, 0, 0, 2894.52, 6226.45, 77.7758, 3.64774, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
17+
(@CGUID+10, 25284, 571, 3537, 4129, 1, 1, 0, 0, 2902.44, 6158.43, 78.5022, 2.96706, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
18+
(@CGUID+11, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2895.37, 6293.76, 61.6635, 4.24115, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
19+
(@CGUID+12, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2934.04, 6166.06, 62.0291, 2.00713, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
20+
(@CGUID+13, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2819.93, 6311.56, 62.5366, 4.69494, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
21+
(@CGUID+14, 25284, 571, 3537, 4129, 1, 1, 0, 0, 2921.87, 6135.71, 78.5082, 5.16617, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
22+
(@CGUID+15, 25284, 571, 3537, 4129, 1, 1, 0, 0, 2754.33, 6240.9, 77.7758, 3.1765, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
23+
(@CGUID+16, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2704.21, 6040.9, 30.7446, 5.77704, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
24+
(@CGUID+17, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2722.75, 6031.68, 30.6742, 2.18166, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
25+
(@CGUID+18, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2685.12, 6131.61, 40.0764, 2.53073, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
26+
(@CGUID+19, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2689.42, 6110.31, 40.1811, 2.19912, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
27+
(@CGUID+20, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2680.27, 6147.35, 40.3715, 5.60251, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
28+
(@CGUID+21, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2721.42, 6008.34, 32.7563, 3.80482, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
29+
(@CGUID+22, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2650.33, 6111.8, 38.2883, 3.00197, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
30+
(@CGUID+23, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2689.25, 6194.8, 54.0332, 3.49066, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
31+
(@CGUID+24, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2669.27, 6179.79, 39.3598, 5.65487, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
32+
(@CGUID+25, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2656.43, 6220.2, 38.5179, 1.76278, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
33+
(@CGUID+26, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2567.77, 6109.05, 54.6977, 3.76991, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
34+
(@CGUID+27, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2641.34, 6031.71, 54.2912, 3.26377, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
35+
(@CGUID+28, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2625.26, 6095.54, 54.0161, 5.23599, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
36+
(@CGUID+29, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2585.7, 6190.79, 39.1659, 3.90954, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
37+
(@CGUID+30, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2615.04, 6115.13, 45.4237, 2.49582, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
38+
(@CGUID+31, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2634.75, 6034.53, 54.0479, 3.07178, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
39+
(@CGUID+32, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2700.17, 6236.87, 39.5734, 6.12611, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
40+
(@CGUID+33, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2660.3, 6237.82, 38.3345, 3.90954, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
41+
(@CGUID+34, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2671.28, 6169.58, 39.5054, 5.51524, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
42+
(@CGUID+35, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2717.3, 6294.58, 61.7433, 1.3439, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
43+
(@CGUID+36, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2673.98, 6268.22, 39.8142, 2.63545, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
44+
(@CGUID+37, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2629.93, 6118.81, 38.2883, 2.42601, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
45+
(@CGUID+38, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2627.62, 6052.65, 54.0331, 6.21337, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
46+
(@CGUID+39, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2590.95, 6064.32, 53.932, 0.994838, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
47+
(@CGUID+40, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2637.65, 6217.15, 40.1605, 2.19912, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
48+
(@CGUID+41, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2677.92, 6199.64, 39.8142, 2.51327, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
49+
(@CGUID+42, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2708.72, 6270.94, 47.0079, 3.22886, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
50+
(@CGUID+43, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2990.11, 6142.67, 61.5929, 1.27409, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
51+
(@CGUID+44, 25284, 571, 3537, 4020, 1, 1, 0, 0, 2979.68, 6128.44, 62.3862, 2.84489, 300, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
52+
(@CGUID+45, 35644, 650, 4723, 4723, 3, 1, 0, 0, 702.967, 587.649, 412.475, 0.610865, 7200, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
53+
(@CGUID+46, 35644, 650, 4723, 4723, 3, 1, 0, 0, 774.898, 573.736, 412.475, 2.14675, 7200, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
54+
(@CGUID+47, 35644, 650, 4723, 4723, 3, 1, 0, 0, 787.439, 584.969, 412.476, 2.47837, 7200, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
55+
(@CGUID+48, 35644, 650, 4723, 4723, 3, 1, 0, 0, 712.594, 576.26, 412.476, 0.890118, 7200, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
56+
(@CGUID+49, 35644, 650, 4723, 4723, 3, 1, 0, 0, 720.57, 571.285, 412.475, 1.06465, 7200, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0),
57+
(@CGUID+50, 36558, 650, 4723, 4723, 3, 1, 0, 0, 790.177, 589.059, 412.475, 2.56563, 7200, 0, 0, 1, 0, 0, 0, 0, 0, '', NULL, 0);
58+
59+
-- pool_template
60+
DELETE FROM `pool_template` WHERE `entry`= @POOLID;
61+
INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES
62+
(@POOLID, 15, 'MASTER Minerals Wintergrasp zone 4197');
63+
64+
-- pool_members
65+
DELETE FROM `pool_members` WHERE `type`=2 AND `poolSpawnId`=@POOLID;
66+
INSERT INTO `pool_members` (`type`, `spawnId`, `poolSpawnId`, `chance`, `description`) VALUES
67+
(2, 5617, @POOLID, 0, 'Wintergrasp mineral, node 1'),
68+
(2, 5618, @POOLID, 0, 'Wintergrasp mineral, node 2'),
69+
(2, 5619, @POOLID, 0, 'Wintergrasp mineral, node 3'),
70+
(2, 5620, @POOLID, 0, 'Wintergrasp mineral, node 4'),
71+
(2, 5621, @POOLID, 0, 'Wintergrasp mineral, node 5'),
72+
(2, 5622, @POOLID, 0, 'Wintergrasp mineral, node 6'),
73+
(2, 5623, @POOLID, 0, 'Wintergrasp mineral, node 7'),
74+
(2, 5624, @POOLID, 0, 'Wintergrasp mineral, node 8'),
75+
(2, 5625, @POOLID, 0, 'Wintergrasp mineral, node 9'),
76+
(2, 5626, @POOLID, 0, 'Wintergrasp mineral, node 10'),
77+
(2, 5627, @POOLID, 0, 'Wintergrasp mineral, node 11'),
78+
(2, 5628, @POOLID, 0, 'Wintergrasp mineral, node 12'),
79+
(2, 5629, @POOLID, 0, 'Wintergrasp mineral, node 13'),
80+
(2, 5630, @POOLID, 0, 'Wintergrasp mineral, node 14'),
81+
(2, 5631, @POOLID, 0, 'Wintergrasp mineral, node 15'),
82+
(2, 5632, @POOLID, 0, 'Wintergrasp mineral, node 16'),
83+
(2, 5633, @POOLID, 0, 'Wintergrasp mineral, node 17'),
84+
(2, 5634, @POOLID, 0, 'Wintergrasp mineral, node 18'),
85+
(2, 5635, @POOLID, 0, 'Wintergrasp mineral, node 19'),
86+
(2, 5636, @POOLID, 0, 'Wintergrasp mineral, node 20'),
87+
(2, 5637, @POOLID, 0, 'Wintergrasp mineral, node 21'),
88+
(2, 5638, @POOLID, 0, 'Wintergrasp mineral, node 22'),
89+
(2, 5639, @POOLID, 0, 'Wintergrasp mineral, node 23'),
90+
(2, 5640, @POOLID, 0, 'Wintergrasp mineral, node 24'),
91+
(2, 5641, @POOLID, 0, 'Wintergrasp mineral, node 25'),
92+
(2, 5642, @POOLID, 0, 'Wintergrasp mineral, node 26'),
93+
(2, 5643, @POOLID, 0, 'Wintergrasp mineral, node 27'),
94+
(2, 5644, @POOLID, 0, 'Wintergrasp mineral, node 28'),
95+
(2, 5645, @POOLID, 0, 'Wintergrasp mineral, node 29'),
96+
(2, 5646, @POOLID, 0, 'Wintergrasp mineral, node 30'),
97+
(2, 5647, @POOLID, 0, 'Wintergrasp mineral, node 31'),
98+
(2, 5648, @POOLID, 0, 'Wintergrasp mineral, node 32'),
99+
(2, 5649, @POOLID, 0, 'Wintergrasp mineral, node 33'),
100+
(2, 5650, @POOLID, 0, 'Wintergrasp mineral, node 34'),
101+
(2, 5651, @POOLID, 0, 'Wintergrasp mineral, node 35'),
102+
(2, 5652, @POOLID, 0, 'Wintergrasp mineral, node 36'),
103+
(2, 5653, @POOLID, 0, 'Wintergrasp mineral, node 37'),
104+
(2, 5654, @POOLID, 0, 'Wintergrasp mineral, node 38'),
105+
(2, 5655, @POOLID, 0, 'Wintergrasp mineral, node 39'),
106+
(2, 5656, @POOLID, 0, 'Wintergrasp mineral, node 40'),
107+
(2, 5657, @POOLID, 0, 'Wintergrasp mineral, node 41'),
108+
(2, 5658, @POOLID, 0, 'Wintergrasp mineral, node 42'),
109+
(2, 5659, @POOLID, 0, 'Wintergrasp mineral, node 43'),
110+
(2, 5660, @POOLID, 0, 'Wintergrasp mineral, node 44'),
111+
(2, 5661, @POOLID, 0, 'Wintergrasp mineral, node 45');

0 commit comments

Comments
 (0)