Scripts/XT002: Fixed Scrapbot repair

2 files changed, 3 insertions, 30 deletions

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index e3d0519bfa7..2fb733523c5 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -5150,38 +5150,9 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 /*damage*/, AuraEffect* trig
     Item* castItem = !triggeredByAura->GetBase()->GetCastItemGUID().IsEmpty() && GetTypeId() == TYPEID_PLAYER
         ? ToPlayer()->GetItemByGuid(triggeredByAura->GetBase()->GetCastItemGUID()) : NULL;
 
-    uint32 triggered_spell_id = 0;
     Unit* target = victim;
 
-    switch (dummySpell->SpellFamilyName)
-    {
-        case SPELLFAMILY_GENERIC:
-        {
-            switch (dummySpell->Id)
-            {
-                case 47020: // Enter vehicle XT-002 (Scrapbot)
-                {
-                    if (GetTypeId() != TYPEID_UNIT)
-                        return false;
-
-                    Unit* vehicleBase = GetVehicleBase();
-                    if (!vehicleBase)
-                        return false;
-
-                    // Todo: Check if this amount is blizzlike
-                    vehicleBase->ModifyHealth(int32(vehicleBase->CountPctFromMaxHealth(1)));
-                    break;
-                }
-            }
-            break;
-        }
-        default:
-            break;
-    }
-
-    // if not handled by custom case, get triggered spell from dummySpell proto
-    if (!triggered_spell_id)
-        triggered_spell_id = triggeredByAura->GetSpellEffectInfo()->TriggerSpell;
+    uint32 triggered_spell_id = triggeredByAura->GetSpellEffectInfo()->TriggerSpell;
 
     // processed charge only counting case
     if (!triggered_spell_id)
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
index 358eedf1809..782bbe1073c 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
@@ -81,6 +81,7 @@ enum Spells
 
     // Scrabot:
     SPELL_SCRAPBOT_RIDE_VEHICLE                 = 47020,
+    SPELL_SCRAP_REPAIR                          = 62832,
     SPELL_SUICIDE                               = 7,
 
     //------------------BOOMBOT-----------------------
@@ -317,6 +318,7 @@ class boss_xt002 : public CreatureScript
                         ++_heartExposed;
 
                     Talk(EMOTE_SCRAPBOT);
+                    DoCast(who, SPELL_SCRAP_REPAIR, true);
                     _healthRecovered = true;
                 }