diff options
| -rw-r--r-- | sql/FULL/world_script_texts.sql | 2 | ||||
| -rw-r--r-- | sql/updates/7666_world_script_texts.sql | 3 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 6 | ||||
| -rw-r--r-- | src/scripts/northrend/ulduar/ulduar/boss_xt002.cpp | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/sql/FULL/world_script_texts.sql b/sql/FULL/world_script_texts.sql index 6a2787b9ee7..ab68e488a6d 100644 --- a/sql/FULL/world_script_texts.sql +++ b/sql/FULL/world_script_texts.sql @@ -2145,7 +2145,7 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1` (32906,-1603184,'His hold on me dissipates. I can see clearly once more. Thank you, heroes.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15531,1,0,0,'Freya SAY_DEATH'), (32906,-1603185,'You have strayed too far, wasted too much time!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15532,1,0,0,'Freya SAY_BERSERK'), (32906,-1603186,'Eonar, your servant requires aid!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15528,1,0,0,'Freya SAY_SUMMON_CONSERVATOR'), - (32906,-1603187,'Children, assist me!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15331,1,0,0,'Freya SAY_SUMMON_TRIO'), + (32906,-1603187,'Children, assist me!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15533,1,0,0,'Freya SAY_SUMMON_TRIO'), (32906,-1603188,'The swarm of the elements shall overtake you!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15534,1,0,0,'Freya SAY_SUMMON_LASHERS'), (32906,-1603189,'Eonar, your servant calls for your blessing!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15535,1,0,0,'Freya SAY_YS_HELP'), diff --git a/sql/updates/7666_world_script_texts.sql b/sql/updates/7666_world_script_texts.sql new file mode 100644 index 00000000000..ec6a760adea --- /dev/null +++ b/sql/updates/7666_world_script_texts.sql @@ -0,0 +1,3 @@ +DELETE FROM `script_texts` WHERE `entry`=-1603187; +INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES +(32906,-1603187,'Children, assist me!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15533,1,0,0,'Freya SAY_SUMMON_TRIO'); diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 4f97861c9a1..fabc476e8ff 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -14314,7 +14314,11 @@ bool Unit::IsTriggeredAtSpellProcEvent(Unit *pVictim, Aura * aura, SpellEntry co // In most cases req get honor or XP from kill if (EventProcFlag & PROC_FLAG_KILL && GetTypeId() == TYPEID_PLAYER) { - bool allow = this->ToPlayer()->isHonorOrXPTarget(pVictim); + bool allow = false; + + if (pVictim) + allow = ToPlayer()->isHonorOrXPTarget(pVictim); + // Shadow Word: Death - can trigger from every kill if (aura->GetId() == 32409) allow = true; diff --git a/src/scripts/northrend/ulduar/ulduar/boss_xt002.cpp b/src/scripts/northrend/ulduar/ulduar/boss_xt002.cpp index 9d2c9f8d6fb..a112108389a 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_xt002.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_xt002.cpp @@ -459,7 +459,7 @@ struct boss_xt002_AI : public BossAI uiSpawnAddTimer = TIMER_SPAWN_ADD; if (!hardMode) - m_creature->ModifyHealth(-transferHealth); + m_creature->ModifyHealth(-((int32)transferHealth)); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); phase = 1; |