diff options
| -rw-r--r-- | sql/updates/world/master/2025_11_15_02_world.sql | 38 | ||||
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 1 |
2 files changed, 38 insertions, 1 deletions
diff --git a/sql/updates/world/master/2025_11_15_02_world.sql b/sql/updates/world/master/2025_11_15_02_world.sql new file mode 100644 index 00000000000..ea4ee0ee4b4 --- /dev/null +++ b/sql/updates/world/master/2025_11_15_02_world.sql @@ -0,0 +1,38 @@ +-- CREATURE_STATIC_FLAG_3_ALLOW_INTERACTION_WHILE_IN_COMBAT +UPDATE `creature_template_difficulty` ctd +LEFT JOIN `creature_template` AS ct ON ct.`entry`=ctd.`Entry` +SET ctd.`StaticFlags3`= ctd.`StaticFlags3` | 0x40000 +WHERE (ct.`unit_flags3` & 0x00100000) != 0; + +UPDATE `creature_template` SET `unit_flags3`= `unit_flags3` &~ 0x00100000; + +UPDATE `creature_template_difficulty` SET `StaticFlags3`=`StaticFlags3` | 0x40000 WHERE (`TypeFlags` & 0x40000) != 0; +UPDATE `creature_template_difficulty` SET `StaticFlags3`=`StaticFlags3` | 0x40000 WHERE `Entry` IN (416,417,1860,1863,2991,11858,62600,62595,62593,62574,62573,62444,62412,62410,62407,62406,62404, +62401,62400,62376,62243,62227,61886,61649,61563,61534,61521,61417,61381,23778,60865,60571,60565,60428,60182,59609,59572,59565,59564,59561,59541,59463,59343,59342,59340,59338,59337,59334,59333,59332, +59271,59262,59136,58965,58964,58963,58960,58959,58911,58738,58737,58511,58510,58509,58508,58506,58504,58503,58502,58501,58471,58470,58469,58468,58467,58466,58465,58408,58160,58014,57417,57108,56638, +56594,56593,56512,56490,56420,56419,56418,56417,56416,56413,56411,56410,56409,56408,56407,56371,56339,56203,56134,56110,55918,27881,27883,27894,55650,55649,28094,55532,28312,28319,28366,55172,55140, +55137,55087,55082,55075,55059,55025,55009,54973,54926,54905,54888,54887,54885,54697,54610,54440,54439,54437,54436,54429,54424,54305,54304,54259,54249,54246,54245,54243,54241,54163,54110,54109,53913, +53912,53911,53882,53881,53876,53875,53874,53873,53745,53724,53713,53499,53480,53449,53448,53446,53365,53364,53304,53303,53262,53259,53234,53214,53196,53133,53080,53073,53056,53020,53015,52996,52955, +52954,30021,52935,52934,52932,52921,52907,52906,52902,52901,52900,52899,52898,52897,52854,52849,52848,52847,52846,52845,52844,52843,52838,52825,52824,52823,52822,52802,52801,52800,52796,52555,52554, +52551,52495,52494,52493,52492,52491,52490,52489,52488,52478,52477,52476,52467,52461,52444,52410,52135,52134,52073,52070,51788,51552,51374,51373,51146,50904,50902,50894,50893,50888,50878,32627,32629, +50589,50569,50568,50566,50565,50564,50563,50560,50559,50558,50557,50556,50555,50554,50499,32898,50466,50428,50427,50385,50371,33059,33060,33062,33063,33067,33080,50261,33109,50252,33139,33167,33178, +50076,50006,33264,49956,49900,49896,49895,49882,49879,49706,49480,49477,49378,49000,34249,34434,48503,48500,48485,34518,48364,34604,34689,34695,34696,48172,34776,34777,34778,34793,48053,48046,47999, +35069,35077,35112,35115,35230,47611,35335,35336,47513,47493,47492,47422,35526,35550,35551,35552,35553,35566,47374,47344,35619,47317,47313,47312,47281,47278,35839,35872,47229,47224,47223,35893,47210, +35906,35911,47195,36115,36117,36140,36170,36186,47088,36290,47057,36330,47050,36332,47039,47038,36355,36356,47007,47006,46978,46977,46969,46968,36451,36454,36455,36456,36463,36464,46939,46926,46923, +46922,46921,36491,36492,46897,46895,46893,46892,46850,46831,46814,46813,46812,46811,46810,46809,46808,46807,46806,46805,46804,36615,36616,36631,36695,36698,36717,36743,36744,36745,46628,36746,46627, +36748,46626,36749,46625,46616,46615,36779,36780,46585,46583,36795,36797,36798,46553,46470,46468,36894,36895,36920,36955,36999,46177,46176,46175,46174,37061,37064,37065,46143,37081,46036,46035,46030, +46029,46028,46019,46002,37195,37197,37489,45880,45879,45878,45874,37554,45674,45673,45624,45623,45622,45608,45607,45606,37847,45578,45577,45576,45564,37875,37876,45556,45473,45432,45424,38027,45363, +45361,38037,45344,45332,38122,38145,45294,38146,38148,38149,45289,45278,45277,45247,38217,38218,45236,38242,38243,38244,38245,38246,38247,38268,38272,38278,38279,38280,38281,38282,45169,38348,38387, +38415,38441,38465,38470,38474,38510,38511,38513,38514,38515,38516,38517,38518,44990,44989,38538,38539,44972,44970,44951,38613,38614,38647,38746,44884,44883,38764,38766,38767,38779,38782,38783,38791, +38792,38794,38853,38878,44802,44799,39016,39028,44679,39062,39065,39066,44666,44585,44584,39199,39201,39205,39226,44540,44522,44465,44455,44413,44370,44369,39594,39640,44143,44080,44025,39857,44009, +39882,39895,43938,39946,39963,43905,43901,43898,43897,43894,43893,39992,43829,43828,43827,43826,43812,43810,43809,43804,43745,40139,40227,43651,43610,43609,43608,43607,43600,43591,43558,43546,43514, +43510,43508,43503,43462,43461,43460,43459,43448,43447,43446,43445,43435,43434,43433,43432,40639,40641,40642,43319,40643,40644,40645,40646,43305,43303,43302,43300,40690,43275,43274,43272,43270,40737, +40785,43184,43169,43168,40804,40805,43160,43116,43100,43071,40916,40917,40918,40920,40921,42953,42853,42736,42731,42730,42676,42619,42618,42574,42488,42473,42472,42466,42411,42410,42314,42295,42123, +42122,42077,42075,42074,42073,42072,42071,42038,42037,42036,42031,42030,42029,42020,42019,41988,41987,41985,41980,41812,41811,41810,41793,41784,41783,41780,41779,41770,41769,41632,41630,41570,41562, +41552,41551,41543,41542,41541,41540,41535,41476,41457,41456,41455,41448,41447,41444,41421,41418,41417,41310,41281,41256,41235,41218,41199,41196,41170,41169,41117,41112,41083,41077,41050,41049,41032, +41020,41019,41010,41009,40988,40984,40978,62786,62802,62804,62805,63071,63310,63571,63576,63749,63750,63784,64236,64237,64360,64380,64392,64401,64427,64428,64430,64431,64435,64437,64467,64491,64493, +64494,64498,64499,64502,64503,64505,64506,64509,64510,64647,64705,64838,64884,64886,64888,64889,64892,65022,65252,65325,65353,65536,65558,65641,65713,65714,65727,65868,65869,65999,66024,66037,66038, +66067,66158,66159,66160,66207,66216,66387,66643,66646,66656,66659,66679,66680,66681,66682,66683,66694,66769,66770,66899,66961,67158,67436,67438,67439,67555,67556,67557,67568,67569,67671,67883,67886, +67888,67889,67890,67891,67939,68057,68058,68060,68062,68063,68064,68240,68243,68244,68245,68246,68247,68275,68373,68394,68420,68591,68595,68596,68597,68598,68599,69210,69226,69227,69228,69229,69338, +69348,69565,69655,69660,69661,69662,69949,70348,70434,70743,70971,70972,71028,71132,71172,71173,71178,71202,71226,71263,71275,71281,71282,71283,71285,71290,71291,71305,71306,71307,71308,71319,71320, +71322,71355,71361,71362,71373,71374,71375,71377,71403,71427,71430,72298,72408,72787,72810,72828,72847,72910,73335); diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index cb0c5d14a43..7f7e2f1a61f 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -581,7 +581,6 @@ bool Creature::InitEntry(uint32 entry, CreatureData const* data /*= nullptr*/) // TODO: migrate these in DB _staticFlags.ApplyFlag(CREATURE_STATIC_FLAG_2_ALLOW_MOUNTED_COMBAT, (GetCreatureDifficulty()->TypeFlags & CREATURE_TYPE_FLAG_ALLOW_MOUNTED_COMBAT) != 0); SetIgnoreFeignDeath((creatureInfo->flags_extra & CREATURE_FLAG_EXTRA_IGNORE_FEIGN_DEATH) != 0); - SetInteractionAllowedInCombat((GetCreatureDifficulty()->TypeFlags & CREATURE_TYPE_FLAG_ALLOW_INTERACTION_WHILE_IN_COMBAT) != 0); SetTreatAsRaidUnit((GetCreatureDifficulty()->TypeFlags & CREATURE_TYPE_FLAG_TREAT_AS_RAID_UNIT) != 0); return true; |