diff --git a/sql/updates/world/4.3.4/2020_08_09_02_world.sql b/sql/updates/world/4.3.4/2020_08_09_02_world.sql new file mode 100644 index 00000000000..3f0cfc84cc3 --- /dev/null +++ b/sql/updates/world/4.3.4/2020_08_09_02_world.sql @@ -0,0 +1,8 @@ +-- Default entry +UPDATE `creature_template` SET `flags_extra`= `flags_extra` | 0x2000 WHERE `entry` IN (229, 1182, 4952, 5202, 10938, 14122, 15546, 15727, 15809, 15896, 15904, 15910, 15925, 15933, 16092, 16129, 16364, 16400, 16486, 16697, 16897, 16898, 16899, 17008, 17025, 17059, 17060, 17176, 17211, 17231, 17248, 17293, 17451, 17469, 17470, 17471, 17516, 17529, 17611, 17646, 17687, 17847, 17886, 17955, 18104, 18156, 18157, 18158, 18163, 18164, 18305, 18306, 18307, 18308, 18370, 18372, 18409, 18458, 18479, 18491, 18504, 18564, 18581, 18729, 18734, 18735, 18736, 18737, 18738, 18793, 18891, 19067, 19139, 19159, 19198, 19210, 19211, 19212, 19297, 19376, 19381, 19387, 19388, 19393, 19421, 19437, 19439, 19464, 19483, 19484, 19523, 19524, 19577, 19597, 19677, 19727, 19750, 19845, 19922, 19939, 20003, 20023, 20024, 20084, 20093, 20133, 20143, 20148, 20155, 20156, 20229, 20286, 20288, 20289, 20391, 20392, 20405, 20431, 20462, 20602, 20605, 20608, 20675, 20676, 20709, 20736, 20804, 20858, 20933, 20978, 21002, 21030, 21041, 21049, 21052, 21092, 21094, 21095, 21096, 21101, 21144, 21149, 21150, 21157, 21159, 21160, 21186, 21203, 21252, 21281, 21290, 21310, 21316, 21322, 21334, 21364, 21369, 21414, 21436, 21437, 21438, 21439, 21440, 21447, 21628, 21664, 21682, 21683, 21684, 21689, 21726, 21747, 21748, 21750, 21752, 21756, 21761, 21791, 21792, 21793, 21794, 21812, 21855, 21856, 21933, 21934, 21958, 22054, 22083, 22114, 22131, 22140, 22161, 22207, 22228, 22232, 22233, 22235, 22240, 22246, 22258, 22269, 22277, 22279, 22280, 22288, 22317, 22335, 22340, 22389, 22418, 22422, 22430, 22431, 22449, 22457, 22463, 22465, 22507, 22521, 22841, 22856, 22865, 22996, 23019, 23041, 23061, 23069, 23070, 23082, 23085, 23088, 23113, 23116, 23121, 23124, 23189, 23190, 23215, 23230, 23241, 23250, 23252, 23259, 23261, 23281, 23282, 23292, 23293, 23294, 23295, 23296, 23297, 23298, 23299, 23307, 23336, 23340, 23342, 23344, 23345, 23346, 23348, 23358, 23375, 23387, 23405, 23421, 23429, 23448, 23451, 23467, 23472, 23487, 23499, 23503, 23508, 23509, 23537, 23557, 23686, 23702, 23703, 23705, 23709, 23716, 23771, 23777, 23806, 23818, 23876, 23877, 23878, 23879, 23880, 23894, 23920, 23965, 23996, 23997, 24012, 24068, 24112, 24114, 24136, 24187, 24221, 24260, 24280, 24284, 24325, 24326, 24471, 24504, 24536, 24551, 24666, 24675, 24721, 24792, 24809, 24817, 24820, 24824, 24858, 24902, 24911, 24913, 24973, 24992, 25063, 25172, 25173, 25229, 25230, 25231, 25232, 25252, 25254, 25255, 25267, 25269, 25284, 25293, 25319, 25342, 25343, 25349, 25384, 25423, 25502, 25510, 25511, 25512, 25513, 25525, 25603, 25608, 25614, 25624, 25640, 25703, 25735, 25745, 25746, 25762, 25848, 25879, 25952, 25953, 25964, 25965, 25966, 25971, 25972, 25973, 26057, 26120, 26121, 26162, 26230, 26262, 26286, 26346, 26365, 26523, 26668, 26675, 26678, 26712, 26774, 26775, 26777, 26778, 26832, 26834, 26918, 27075, 27079, 27099, 27101, 27123, 27171, 27241, 27257, 27268, 27282, 27303, 27305, 27307, 27308, 27309, 27327, 27359, 27369, 27375, 27384, 27392, 27403, 27404, 27454, 27455, 27480, 27530, 27564, 27567, 27583, 27607, 27625, 27669, 27671, 27693, 27714, 27757, 27788, 27827, 27829, 27832, 27839, 27840, 27847, 27868, 27881, 27886, 27890, 27894, 27908, 27909, 27914, 27932, 27939, 27942, 27981, 27999, 28055, 28061, 28094, 28130, 28136, 28142, 28144, 28148, 28150, 28166, 28174, 28183, 28234, 28235, 28236, 28237, 28260, 28265, 28274, 28277, 28301, 28312, 28319, 28351, 28366, 28408, 28509, 28525, 28542, 28543, 28544, 28567, 28614, 28616, 28619, 28640, 28655, 28656, 28665, 28719, 28724, 28781, 28823, 28833, 28852, 28853, 28857, 28864, 28884, 28886, 28887, 28891, 28893, 28894, 28904, 28947, 29011, 29032, 29038, 29048, 29061, 29065, 29067, 29068, 29070, 29071, 29072, 29073, 29074, 29165, 29184, 29192, 29218, 29265, 29276, 29281, 29326, 29364, 29365, 29399, 29416, 29425, 29457, 29460, 29522, 29580, 29581, 29588, 29589, 29598, 29618, 29619, 29639, 29682, 29684, 29685, 29700, 29708, 29709, 29742, 29748, 29754, 29790, 29791, 29849, 29856, 30054, 30078, 30084, 30090, 30101, 30106, 30121, 30134, 30172, 30173, 30176, 30178, 30181, 30248, 30275, 30282, 30288, 30330, 30332, 30334, 30337, 30391, 30413, 30454, 30465, 30477, 30487, 30492, 30494, 30560, 30563, 30592, 30616, 30639, 30641, 30648, 30650, 30679, 30684, 30702, 30741, 30828, 30837, 30857, 30878, 30882, 30887, 30891, 30896, 30897, 30898, 30899, 30900, 30948, 31004, 31011, 31012, 31013, 31079, 31103, 31118, 31131, 31138, 31144, 31146, 31204, 31253, 31264, 31273, 31282, 31304, 31324, 31406, 31407, 31408, 31409, 31415, 31517, 31526, 31553, 31576, 31577, 31578, 31583, 31641, 31653, 31684, 31686, 31687, 31827, 31831, 31838, 31840, 31856, 31869, 31880, 31881, 31883, 31884, 31893, 31894, 31895, 31896, 31897, 32152, 32154, 32155, 32159, 32174, 32179, 32182, 32183, 32184, 32200, 32204, 32214, 32215, 32217, 32221, 32225, 32227, 32246, 32305, 32316, 32327, 32431, 32445, 32448, 32473, 32512, 32513, 32525, 32528, 32531, 32532, 32541, 32542, 32543, 32545, 32546, 32547, 32567, 32571, 32574, 32594, 32627, 32629, 32634, 32635, 32636, 32637, 32647, 32654, 32655, 32656, 32661, 32666, 32667, 32682, 32694, 32823, 32866, 32879, 32892, 32893, 32897, 32900, 32901, 32926, 32938, 32941, 32946, 32948, 32950, 32953, 32955, 32984, 33001, 33033, 33035, 33037, 33039, 33050, 33052, 33059, 33060, 33061, 33062, 33063, 33064, 33067, 33080, 33086, 33088, 33090, 33104, 33105, 33109, 33114, 33121, 33134, 33136, 33138, 33140, 33141, 33143, 33146, 33167, 33168, 33169, 33170, 33173, 33174, 33184, 33185, 33189, 33210, 33213, 33214, 33215, 33217, 33218, 33221, 33228, 33229, 33233, 33245, 33253, 33254, 33259, 33266, 33272, 33275, 33282, 33287, 33292, 33316, 33317, 33318, 33319, 33320, 33321, 33322, 33323, 33324, 33325, 33326, 33327, 33328, 33330, 33331, 33332, 33333, 33337, 33342, 33343, 33377, 33378, 33380, 33394, 33406, 33411, 33425, 33426, 33440, 33441, 33452, 33488, 33496, 33500, 33503, 33509, 33514, 33516, 33531, 33569, 33575, 33576, 33660, 33661, 33715, 33742, 33782, 33783, 33784, 33790, 33791, 33792, 33793, 33794, 33795, 33796, 33798, 33799, 33800, 33809, 33816, 33835, 33842, 33843, 33844, 33845, 33863, 33870, 33873, 33881, 33882, 33890, 33912, 33914, 33945, 33960, 33965, 33969, 33988, 33990, 33991, 33997, 34000, 34001, 34007, 34012, 34013, 34047, 34050, 34066, 34071, 34072, 34096, 34098, 34099, 34100, 34107, 34120, 34121, 34124, 34125, 34128, 34129, 34143, 34144, 34145, 34147, 34149, 34160, 34163, 34188, 34211, 34223, 34224, 34230, 34232, 34233, 34250, 34286, 34307, 34313, 34316, 34362, 34363, 34367, 34371, 34378, 34430, 34433, 34492, 34494, 34577, 34606, 34607, 34625, 34632, 34652, 34659, 34661, 34704, 34720, 34725, 34726, 34742, 34773, 34775, 34776, 34777, 34778, 34781, 34784, 34793, 34802, 34811, 34813, 34816, 34819, 34820, 34821, 34825, 34827, 34833, 34854, 34862, 34891, 34893, 34925, 34927, 34929, 34935, 34942, 34943, 34944, 35014, 35028, 35029, 35030, 35031, 35032, 35033, 35034, 35035, 35036, 35037, 35038, 35039, 35040, 35041, 35042, 35043, 35044, 35045, 35046, 35047, 35048, 35049, 35050, 35051, 35052, 35056, 35058, 35064, 35065, 35069, 35078, 35079, 35080, 35083, 35084, 35104, 35105, 35107, 35108, 35109, 35110, 35117, 35136, 35137, 35138, 35139, 35140, 35141, 35150, 35163, 35171, 35257, 35273, 35288, 35296, 35311, 35316, 35317, 35335, 35336, 35386, 35388, 35389, 35390, 35391, 35392, 35393, 35458, 35474, 35491, 35493, 35588, 35614, 35644, 35727, 35751, 35752, 35762, 35766, 35770, 35771, 35814, 35819, 35820, 35821, 35845, 35892, 35895, 35902, 35909, 35910, 35914, 35968, 36025, 36064, 36079, 36093, 36098, 36105, 36125, 36126, 36142, 36212, 36215, 36283, 36292, 36295, 36338, 36345, 36355, 36356, 36364, 36408, 36458, 36472, 36489, 36490, 36505, 36509, 36514, 36530, 36536, 36540, 36557, 36558, 36559, 36598, 36599, 36605, 36619, 36643, 36659, 36661, 36665, 36672, 36710, 36727, 36731, 36750, 36761, 36780, 36781, 36782, 36783, 36789, 36794, 36826, 36834, 36835, 36838, 36839, 36846, 36847, 36869, 36870, 36878, 36887, 36890, 36906, 36913, 36918, 36939, 36948, 36950, 36957, 36960, 36961, 36968, 36969, 36978, 36980, 36982, 36983, 36984, 37001, 37006, 37008, 37013, 37074, 37116, 37117, 37118, 37129, 37143, 37155, 37156, 37186, 37191, 37192, 37215, 37219, 37224, 37227, 37488, 37517, 37519, 37528, 37529, 37530, 37533, 37534, 37535, 37540, 37547, 37593, 37669, 37690, 37732, 37744, 37782, 37787, 37788, 37799, 37814, 37824, 37863, 37880, 37882, 37913, 37918, 37920, 37927, 37930, 37932, 37945, 37947, 37948, 37950, 37974, 37978, 37986, 37995, 38003, 38008, 38028, 38038, 38055, 38067, 38068, 38107, 38115, 38118, 38119, 38127, 38150, 38158, 38159, 38162, 38163, 38186, 38223, 38234, 38248, 38287, 38308, 38309, 38317, 38366, 38422, 38424, 38429, 38430, 38450, 38452, 38454, 38458, 38463, 38469, 38473, 38504, 38528, 38530, 38548, 38554, 38556, 38557, 38559, 38560, 38562, 38577, 38584, 38589, 38711, 38712, 38739, 38748, 38754, 38757, 38821, 38878, 38879, 38966, 39039, 39043, 39048, 39070, 39071, 39095, 39125, 39165, 39189, 39190, 39197, 39207, 39210, 39211, 39212, 39213, 39227, 39238, 39253, 39264, 39266, 39323, 39341, 39349, 39388, 39421, 39466, 39570, 39583, 39600, 39620, 39623, 39624, 39635, 39652, 39661, 39662, 39663, 39711, 39727, 39730, 39736, 39737, 39738, 39739, 39740, 39741, 39787, 39794, 39817, 39820, 39833, 39835, 39842, 39859, 39869, 39886, 39887, 39923, 39959, 40001, 40004, 40006, 40007, 40029, 40030, 40040, 40041, 40042, 40043, 40044, 40055, 40058, 40081, 40083, 40091, 40100, 40135, 40141, 40146, 40150, 40164, 40169, 40174, 40180, 40181, 40183, 40202, 40228, 40231, 40244, 40246, 40254, 40255, 40256, 40257, 40260, 40264, 40277, 40283, 40343, 40350, 40355, 40365, 40375, 40399, 40401, 40425, 40426, 40447, 40459, 40460, 40461, 40462, 40468, 40469, 40478, 40488, 40492, 40495, 40500, 40505, 40511, 40538, 40550, 40555, 40566, 40567, 40587, 40592, 40597, 40604, 40622, 40638, 40650, 40651, 40655, 40660, 40661, 40663, 40664, 40676, 40678, 40679, 40680, 40690, 40691, 40692, 40693, 40694, 40695, 40696, 40708, 40718, 40730, 40731, 40732, 40733, 40734, 40735, 40758, 40759, 40762, 40771, 40782, 40784, 40786, 40788, 40791, 40792, 40797, 40812, 40835, 40851, 40852, 40854, 40857, 40859, 40861, 40866, 40867, 40868, 40869, 40871, 40873, 40927, 40931, 40938, 40957, 40979, 40985, 40993, 40995, 41031, 41041, 41045, 41055, 41068, 41085, 41091, 41093, 41144, 41168, 41177, 41178, 41187, 41193, 41194, 41195, 41201, 41216, 41223, 41240, 41246, 41257, 41264, 41266, 41299, 41324, 41340, 41376, 41399, 41494, 41495, 41505, 41548, 41564, 41567, 41568, 41571, 41572, 41574, 41575, 41576, 41577, 41582, 41583, 41585, 41587, 41594, 41596, 41597, 41599, 41620, 41629, 41672, 41687, 41711, 41730, 41736, 41737, 41744, 41749, 41752, 41753, 41754, 41755, 41756, 41765, 41767, 41768, 41781, 41789, 41805, 41806, 41807, 41809, 41838, 41843, 41856, 41860, 41861, 41862, 41863, 41879, 41885, 41901, 41917, 41919, 41930, 41931, 41932, 41933, 41942, 41945, 41946, 41948, 41955, 41956, 41957, 41958, 41960, 41961, 41963, 41964, 41968, 41969, 41970, 41971, 41972, 41973, 41974, 41975, 41976, 41977, 41978, 42001, 42013, 42018, 42021, 42022, 42055, 42059, 42079, 42083, 42087, 42094, 42095, 42096, 42098, 42103, 42121, 42145, 42164, 42186, 42187, 42189, 42201, 42203, 42204, 42205, 42206, 42207, 42208, 42219, 42236, 42239, 42240, 42241, 42245, 42246, 42247, 42254, 42255, 42257, 42258, 42260, 42261, 42267, 42268, 42285, 42305, 42307, 42314, 42317, 42320, 42321, 42328, 42329, 42340, 42345, 42347, 42351, 42355, 42356, 42388, 42389, 42409, 42490, 42495, 42496, 42499, 42516, 42517, 42519, 42561, 42566, 42567, 42568, 42570, 42576, 42577, 42593, 42595, 42596, 42620, 42627, 42636, 42673, 42674, 42678, 42690, 42693, 42706, 42728, 42736, 42776, 42784, 42787, 42809, 42844, 42846, 42856, 42861, 42915, 42920, 42934, 42992, 42993, 42994, 42995, 42996, 42997, 42998, 42999, 43020, 43037, 43070, 43090, 43093, 43159, 43176, 43177, 43179, 43180, 43216, 43220, 43225, 43242, 43257, 43287, 43289, 43293, 43297, 43323, 43334, 43336, 43337, 43357, 43361, 43362, 43370, 43393, 43396, 43400, 43401, 43402, 43403, 43404, 43406, 43407, 43437, 43443, 43444, 43450, 43452, 43472, 43479, 43481, 43483, 43484, 43497, 43499, 43501, 43519, 43521, 43549, 43557, 43560, 43561, 43571, 43572, 43583, 43584, 43585, 43591, 43592, 43596, 43601, 43602, 43603, 43650, 43655, 43656, 43677, 43683, 43691, 43698, 43700, 43717, 43743, 43752, 43753, 43755, 43763, 43765, 43777, 43780, 43785, 43788, 43790, 43793, 43801, 43817, 43853, 43855, 43868, 43869, 43900, 43918, 43922, 43926, 43934, 43935, 43999, 44003, 44008, 44050, 44055, 44057, 44137, 44139, 44144, 44145, 44146, 44147, 44157, 44171, 44172, 44175, 44199, 44201, 44208, 44214, 44258, 44291, 44314, 44359, 44373, 44389, 44412, 44419, 44420, 44434, 44438, 44477, 44490, 44493, 44523, 44524, 44535, 44538, 44539, 44540, 44541, 44548, 44553, 44566, 44581, 44586, 44614, 44703, 44705, 44711, 44712, 44731, 44744, 44752, 44764, 44765, 44794, 44796, 44798, 44801, 44820, 44821, 44834, 44840, 44842, 44844, 44845, 44848, 44862, 44892, 44893, 44894, 44920, 44923, 44931, 44937, 44939, 44940, 44941, 44949, 44950, 44955, 44957, 45003, 45026, 45030, 45032, 45051, 45088, 45124, 45126, 45144, 45181, 45186, 45263, 45270, 45273, 45316, 45322, 45344, 45388, 45396, 45406, 45420, 45427, 45430, 45435, 45452, 45455, 45469, 45504, 45505, 45507, 45524, 45526, 45527, 45560, 45572, 45615, 45660, 45680, 45685, 45710, 45716, 45721, 45731, 45732, 45746, 45747, 45749, 45752, 45848, 45857, 45866, 45874, 45875, 45876, 45881, 45884, 45885, 45901, 45910, 45932, 45942, 45954, 45991, 46006, 46007, 46015, 46023, 46024, 46067, 46070, 46074, 46087, 46097, 46100, 46110, 46115, 46120, 46141, 46147, 46157, 46186, 46207, 46246, 46266, 46276, 46284, 46287, 46292, 46294, 46296, 46301, 46304, 46364, 46372, 46374, 46387, 46392, 46411, 46419, 46448, 46451, 46462, 46471, 46473, 46481, 46484, 46492, 46498, 46502, 46511, 46515, 46516, 46535, 46548, 46554, 46558, 46588, 46596, 46644, 46647, 46669, 46679, 46680, 46719, 46720, 46721, 46722, 46723, 46724, 46725, 46726, 46727, 46728, 46729, 46730, 46731, 46734, 46735, 46743, 46746, 46747, 46752, 46776, 46777, 46778, 46779, 46780, 46798, 46834, 46835, 46842, 46846, 46907, 46924, 46933, 46939, 46957, 46965, 46973, 46974, 46975, 46976, 46978, 47000, 47019, 47020, 47025, 47032, 47034, 47037, 47040, 47049, 47050, 47051, 47052, 47054, 47058, 47065, 47066, 47074, 47075, 47083, 47085, 47088, 47092, 47095, 47096, 47102, 47127, 47129, 47159, 47160, 47176, 47177, 47180, 47185, 47186, 47187, 47189, 47192, 47193, 47196, 47203, 47206, 47210, 47221, 47222, 47225, 47241, 47249, 47251, 47257, 47259, 47261, 47262, 47269, 47274, 47280, 47281, 47292, 47299, 47302, 47305, 47307, 47314, 47315, 47316, 47330, 47332, 47333, 47342, 47364, 47380, 47427, 47429, 47430, 47451, 47461, 47472, 47476, 47482, 47491, 47501, 47513, 47514, 47515, 47516, 47518, 47519, 47520, 47523, 47546, 47562, 47606, 47623, 47678, 47689, 47693, 47694, 47695, 47697, 47698, 47700, 47701, 47702, 47703, 47707, 47708, 47717, 47719, 47721, 47731, 47734, 47746, 47752, 47806, 47807, 47813, 47829, 47853, 47908, 47909, 47916, 47922, 47924, 47925, 47926, 47940, 47943, 47945, 47946, 47947, 47957, 47958, 47961, 47962, 47963, 47964, 47965, 47967, 47972, 47973, 47984, 47985, 47986, 47987, 47988, 47989, 47991, 48005, 48006, 48018, 48052, 48059, 48078, 48092, 48097, 48116, 48142, 48145, 48157, 48165, 48166, 48190, 48196, 48197, 48202, 48214, 48266, 48270, 48276, 48283, 48284, 48293, 48294, 48295, 48296, 48297, 48298, 48299, 48300, 48301, 48302, 48304, 48313, 48327, 48334, 48382, 48422, 48425, 48427, 48437, 48438, 48466, 48476, 48478, 48488, 48495, 48506, 48520, 48534, 48543, 48560, 48563, 48572, 48598, 48644, 48647, 48648, 48694, 48699, 48700, 48711, 48730, 48752, 48756, 48798, 48843, 48852, 48854, 48855, 48904, 48907, 48921, 48964, 48975, 48976, 48977, 48983, 49010, 49011, 49012, 49013, 49014, 49015, 49016, 49017, 49019, 49021, 49026, 49027, 49031, 49032, 49033, 49034, 49039, 49040, 49041, 49042, 49045, 49110, 49114, 49115, 49135, 49143, 49154, 49173, 49185, 49195, 49196, 49199, 49219, 49226, 49259, 49279, 49355, 49356, 49357, 49368, 49371, 49372, 49373, 49420, 49432, 49437, 49447, 49454, 49464, 49465, 49466, 49467, 49473, 49481, 49499, 49520, 49521, 49523, 49527, 49534, 49535, 49536, 49539, 49564, 49576, 49580, 49589, 49597, 49637, 49638, 49680, 49738, 49799, 49801, 49807, 49820, 49848, 49943, 50008, 50014, 50030, 50040, 50042, 50062, 50066, 50074, 50075, 50077, 50078, 50084, 50246, 50253, 50254, 50259, 50261, 50265, 50267, 50268, 50270, 50272, 50276, 50278, 50297, 50298, 50369, 50409, 50410, 50421, 50423, 50425, 50426, 50431, 50439, 50470, 50473, 50476, 50503, 50522, 50525, 50547, 50599, 50604, 50610, 50611, 50612, 50617, 50618, 50619, 50620, 50621, 50623, 50624, 50625, 50626, 50627, 50628, 50629, 50630, 50632, 50633, 50634, 50635, 50636, 50637, 50638, 50639, 50640, 50642, 50643, 50658, 50661, 50672, 50673, 50677, 50679, 50680, 50681, 50685, 50689, 50691, 50693, 50694, 50695, 50696, 50697, 50698, 50699, 50700, 50701, 50702, 50913, 50934, 51033, 51035, 51036, 51038, 51039, 51041, 51047, 51080, 51085, 51089, 51127, 51139, 51141, 51146, 51157, 51172, 51174, 51247, 51259, 51267, 51276, 51293, 51309, 51314, 51329, 51340, 51355, 51357, 51367, 51406, 51407, 51422, 51423, 51435, 51436, 51443, 51444, 51445, 51448, 51452, 51466, 51493, 51494, 51506, 51551, 51594, 51595, 51597, 51598, 51608, 51609, 51629, 52025, 52052, 52056, 52057, 52062, 52065, 52147, 52156, 52160, 52197, 52201, 52203, 52209, 52222, 52288, 52313, 52314, 52320, 52324, 52329, 52330, 52331, 52332, 52350, 52351, 52352, 52353, 52354, 52368, 52387, 52400, 52419, 52430, 52446, 52449, 52450, 52451, 52452, 52453, 52454, 52455, 52528, 52529, 52532, 52577, 52599, 52608, 52650, 52704, 52732, 52750, 52772, 52785, 52811, 52827, 52829, 52834, 52850, 52865, 52866, 52923, 52988, 53014, 53017, 53046, 53053, 53066, 53082, 53083, 53086, 53087, 53089, 53097, 53099, 53122, 53147, 53159, 53160, 53178, 53186, 53216, 53217, 53226, 53233, 53237, 53255, 53258, 53261, 53266, 53268, 53269, 53281, 53300, 53355, 53361, 53363, 53372, 53375, 53393, 53395, 53402, 53417, 53419, 53420, 53433, 53450, 53467, 53473, 53474, 53475, 53485, 53487, 53488, 53489, 53490, 53492, 53495, 53496, 53497, 53498, 53501, 53502, 53508, 53520, 53529, 53531, 53541, 53552, 53554, 53585, 53586, 53615, 53621, 53680, 53681, 53693, 53696, 53698, 53729, 53752, 53768, 53783, 53796, 53819, 53883, 53888, 53899, 53900, 53910, 53914, 53951, 53952, 53953, 53955, 53963, 53967, 53968, 53969, 53970, 53971, 53986, 54019, 54042, 54069, 54074, 54112, 54127, 54137, 54147, 54184, 54190, 54191, 54197, 54203, 54293, 54310, 54311, 54333, 54334, 54344, 54345, 54346, 54382, 54385, 54392, 54393, 54433, 54434, 54435, 54444, 54446, 54466, 54467, 54474, 54486, 54494, 54496, 54500, 54505, 54506, 54509, 54513, 54519, 54521, 54522, 54523, 54524, 54542, 54546, 54547, 54548, 54549, 54550, 54560, 54563, 54565, 54566, 54574, 54580, 54581, 54582, 54585, 54594, 54597, 54598, 54599, 54600, 54628, 54639, 54641, 54644, 54689, 54695, 54735, 54795, 54852, 54864, 54865, 54866, 54939, 54940, 54941, 54942, 54945, 54955, 54995, 55027, 55154, 55332, 55334, 55346, 55377, 55382, 55384, 55385, 55389, 55393, 55394, 55395, 55396, 55400, 55427, 55441, 55445, 55447, 55465, 55466, 55467, 55468, 55469, 55502, 55524, 55532, 55541, 55542, 55543, 55544, 55570, 55641, 55643, 55653, 55695, 55728, 55762, 55779, 55837, 55838, 56027, 56077, 56096, 56099, 56100, 56103, 56104, 56126, 56165, 56167, 56168, 56170, 56176, 56182, 56189, 56231, 56235, 56248, 56258, 56259, 56305, 56307, 56308, 56311, 56332, 56341, 56359, 56389, 56475, 56519, 56545, 56575, 56581, 56584, 56587, 56598, 56599, 56642, 56651, 56681, 56699, 56781, 56846, 56855, 56922, 56923, 57107, 57117, 57190, 57197, 57206, 57238, 57260, 57264, 57265, 57266, 57268, 57281, 57287, 57288, 57289, 57297, 57328, 57329, 57377, 57378, 57379, 57443, 57473, 57474, 57475, 57479, 57480, 57629, 57630, 57686, 57694, 57695, 57696, 57711, 57758, 57768, 57788, 57795, 57809, 57836, 57852, 57867, 57869, 57882, 57920, 57924, 57926, 57929, 57981, 57986, 57987, 57988, 57992, 57993, 58002, 58039, 58042, 58064, 58069, 58110, 58115, 58120, 58122, 58148, 58150, 58174, 58176, 58193, 58195, 58199, 58200, 58226, 58232, 58233, 58235, 58282, 58287, 58473); +-- difficulty 1 +UPDATE `creature_template` SET `flags_extra`= `flags_extra` | 0x2000 WHERE `entry` IN (30183, 20571, 20570, 20598, 20170, 20654, 20659, 20572, 20573, 21534, 21625, 21620, 21584, 21603, 30795, 30776, 30768, 30758, 30769, 31672, 31835, 31655, 31670, 25554, 25558, 30810, 30522, 30539, 30780, 30782, 30784, 30786, 30805, 30757, 31682, 32795, 31388, 31874, 31875, 31878, 32796, 30809, 31518, 31519, 31816, 32218, 32187, 31458, 31446, 31445, 31441, 31448, 31749, 31461, 31521, 30777, 31539, 31492, 31491, 31550, 31547, 32209, 33690, 33352, 33353, 34296, 34215, 33395, 33116, 34045, 33396, 34131, 33191, 34332, 33968, 33397, 33402, 34254, 33385, 34257, 34256, 33887, 33789, 33730, 33756, 33942, 34255, 33954, 33989, 34110, 34174, 34153, 34148, 34189, 34649, 34648, 35415, 35431, 35436, 35417, 35413, 35419, 35265, 35278, 35410, 35427, 35531, 35429, 35541, 35538, 35530, 35536, 35540, 35521, 35528, 35543, 35535, 35537, 35527, 35542, 35520, 35533, 35523, 35525, 35534, 35522, 35524, 35539, 35529, 35532, 35544, 35519, 35433, 35421, 36067, 36357, 36358, 38233, 38174, 37611, 38156, 38157, 38406, 38404, 38262, 38261, 38403, 38408, 38407, 38320, 38405, 38256, 38257, 38000, 38129, 38220, 38219, 38128, 38312, 39284, 38171, 38641, 38775, 38590, 38970, 38973, 39287, 48832, 49079, 40670, 40005, 40470, 43280, 40673, 50379, 49096, 49065, 49082, 49094, 51104, 49973, 51456, 51119, 51459, 51248, 49118, 50194, 50197, 48954, 49097, 49100, 49073, 49062, 49063, 49101, 45933, 49134, 48913, 51251, 48835, 49220, 57866, 50277, 50279, 54051, 53820, 54155, 54564, 57973, 57972, 57437, 57884, 57887, 57700, 57698, 57937, 57974, 57701, 57704, 58034, 57868, 57870); +-- difficulty 2 +UPDATE `creature_template` SET `flags_extra`= `flags_extra` | 0x2000 WHERE `entry` IN (35655, 35266, 35279, 38459, 38637, 38639, 38685, 38679, 38683, 38691, 38675, 38689, 38687, 38321, 38681, 38693, 38677, 38701, 38699, 39285, 38727, 38773, 38776, 38971, 38974, 39288, 40671, 40471, 43281, 40674, 51105, 49979, 51457, 51120, 51460, 51249, 49119, 50195, 50198, 51252, 53821, 58131, 58129, 57438, 57885, 57888, 57837, 57845, 57938, 58133, 57839, 57717); +-- difficulty 3 +UPDATE `creature_template` SET `flags_extra`= `flags_extra` | 0x2000 WHERE `entry` IN (35656, 35267, 35280, 38460, 38638, 38640, 38686, 38680, 38684, 38692, 38676, 38690, 38688, 38322, 38682, 38694, 38678, 38702, 38700, 39286, 38737, 38774, 38777, 38972, 38975, 39289, 40672, 40472, 43282, 40675, 51106, 49985, 51458, 51121, 51461, 51250, 49120, 50196, 50199, 51253, 51627, 53822, 58132, 58130, 57439, 57886, 57889, 57838, 57846, 57939, 58134, 57840, 57718); diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index f7ef6b04ab8..66b9120d3b4 100644 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -108,7 +108,7 @@ void CreatureAI::MoveInLineOfSight(Unit* who) if (me->IsEngaged()) return; - if (me->HasReactState(REACT_AGGRESSIVE) && me->CanStartAttack(who, false)) + if (me->HasReactState(REACT_AGGRESSIVE) && !me->IsIgnoringCombat() && me->CanStartAttack(who, false)) me->EngageWithTarget(who); } diff --git a/src/server/game/Combat/CombatManager.cpp b/src/server/game/Combat/CombatManager.cpp index 02225f32b09..8426a2fb203 100644 --- a/src/server/game/Combat/CombatManager.cpp +++ b/src/server/game/Combat/CombatManager.cpp @@ -44,9 +44,6 @@ return false; if (a->HasUnitState(UNIT_STATE_IN_FLIGHT) || b->HasUnitState(UNIT_STATE_IN_FLIGHT)) return false; - // ... both units must not be ignoring combat - if (a->IsIgnoringCombat() || b->IsIgnoringCombat()) - return false; if (a->IsFriendlyTo(b) || b->IsFriendlyTo(a)) return false; Player const* playerA = a->GetCharmerOrOwnerPlayerOrPlayerItself(); diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 2738592e8ac..fb3e731f6e7 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -2713,7 +2713,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target) if (missInfo != SPELL_MISS_EVADE && spellHitTarget && !m_caster->IsFriendlyTo(unit) && (!m_spellInfo->IsPositive() || m_spellInfo->HasEffect(SPELL_EFFECT_DISPEL))) { if (Unit* unitCaster = m_caster->ToUnit()) - unitCaster->AtTargetAttacked(unit, m_spellInfo->HasInitialAggro()); + unitCaster->AtTargetAttacked(unit, m_spellInfo->HasInitialAggro() && !unitCaster->IsIgnoringCombat()); if (!unit->IsStandState()) unit->SetStandState(UNIT_STAND_STATE_STAND); @@ -7691,7 +7691,11 @@ void Spell::DoAllEffectOnLaunchTarget(TargetInfo& targetInfo, float* multiplier) return; // This will only cause combat - the target will engage once the projectile hits (in DoAllEffectOnTarget) - if (m_originalCaster && targetInfo.missCondition != SPELL_MISS_EVADE && !m_originalCaster->IsFriendlyTo(unit) && (!m_spellInfo->IsPositive() || m_spellInfo->HasEffect(SPELL_EFFECT_DISPEL)) && (m_spellInfo->HasInitialAggro() || unit->IsEngaged())) + if (m_originalCaster && targetInfo.missCondition != SPELL_MISS_EVADE + && !m_originalCaster->IsFriendlyTo(unit) + && (!m_spellInfo->IsPositive() || m_spellInfo->HasEffect(SPELL_EFFECT_DISPEL)) + && (m_spellInfo->HasInitialAggro() || unit->IsEngaged()) + && !m_originalCaster->IsIgnoringCombat()) m_originalCaster->SetInCombatWith(unit); for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i)