Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Fix a bug that dk's ghoul generates energy twice per tick.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-08-24 11:35:01 -05:00
parent 512692f510
commit bcc23fac92
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/game/ObjectMgr.cpp
View File

@@ -8622,9 +8622,17 @@ bool ObjectMgr::CheckDB() const
if(!cInfo || cInfo->faction_A != 21)
return false;
cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(28768);
cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(28768); // Dark Rider of Acherus
if(!cInfo || !cInfo->ScriptID)
return false;
cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(32627); // Wintergrasp Siege Engine
if(!cInfo || !cInfo->spells[0] || cInfo->VehicleId != 117)
return false;
cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(33114); // Flame Leviathan Seat
if(!cInfo || cInfo->VehicleId != 341)
return false;
return true;
}

11
src/game/Pet.cpp
View File

@@ -540,11 +540,12 @@ void Pet::Update(uint32 diff)
m_regenTimer += 4000 - diff;
if(!m_regenTimer) ++m_regenTimer;
break;
case POWER_ENERGY:
Regenerate(POWER_ENERGY);
m_regenTimer += 2000 - diff;
if(!m_regenTimer) ++m_regenTimer;
break;
// in creature::update
//case POWER_ENERGY:
// Regenerate(POWER_ENERGY);
// m_regenTimer += 2000 - diff;
// if(!m_regenTimer) ++m_regenTimer;
// break;
default:
m_regenTimer = 0;
break;

5
src/game/Vehicle.cpp
View File

@@ -82,6 +82,10 @@ void Vehicle::InstallAllAccessories()
case 28782:InstallAccessory(28768,0);break; // Acherus Deathcharger
case 28312:InstallAccessory(28319,7);break;
case 32627:InstallAccessory(32629,7);break;
case 32930:
InstallAccessory(32933,2);
InstallAccessory(32934,1);
break;
case 33109:InstallAccessory(33167,1);break;
case 33060:InstallAccessory(33067,7);break;
case 33113:
@@ -95,6 +99,7 @@ void Vehicle::InstallAllAccessories()
InstallAccessory(33143,2); // Overload Control Device
InstallAccessory(33142,1); // Leviathan Defense Turret
break;
case 33214:InstallAccessory(33218,1);break;
}
}