Merge branch 'master' into 4.3.4 [NOTE: There are parts of code marked as "REVIEW - MERGE" That needs some review)
Conflicts: src/server/game/DataStores/DBCStores.cpp src/server/game/DataStores/DBCStores.h src/server/game/DataStores/DBCfmt.h src/server/game/Entities/Unit/Unit.cpp src/server/game/Entities/Unit/Unit.h src/server/game/Handlers/AuctionHouseHandler.cpp src/server/game/Handlers/GroupHandler.cpp src/server/game/Movement/Spline/MovementTypedefs.h src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/game/Spells/SpellInfo.cpp src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp src/server/scripts/Spells/spell_generic.cpp
This commit is contained in:
commit
1b6fb2b695
211 files changed
+16815
-7664
No files matched your search
@@ -811,7 +811,6 @@ void Spell::EffectTriggerSpell(SpellEffIndex effIndex)
|
||||
// set basepoints for trigger with value effect
|
||||
if (m_spellInfo->Effects[effIndex].Effect == SPELL_EFFECT_TRIGGER_SPELL_WITH_VALUE)
|
||||
{
|
||||
// maybe need to set value only when basepoints == 0?
|
||||
values.AddSpellMod(SPELLVALUE_BASE_POINT0, damage);
|
||||
values.AddSpellMod(SPELLVALUE_BASE_POINT1, damage);
|
||||
values.AddSpellMod(SPELLVALUE_BASE_POINT2, damage);
|
||||
@@ -1826,7 +1825,7 @@ void Spell::SendLoot(uint64 guid, LootType loottype)
|
||||
return;
|
||||
|
||||
case GAMEOBJECT_TYPE_QUESTGIVER:
|
||||
player->PrepareGossipMenu(gameObjTarget, gameObjTarget->GetGOInfo()->questgiver.gossipID);
|
||||
player->PrepareGossipMenu(gameObjTarget, gameObjTarget->GetGOInfo()->questgiver.gossipID, true);
|
||||
player->SendPreparedGossip(gameObjTarget);
|
||||
return;
|
||||
|
||||
@@ -2239,8 +2238,6 @@ void Spell::EffectSummonType(SpellEffIndex effIndex)
|
||||
case SUMMON_CATEGORY_VEHICLE:
|
||||
// Summoning spells (usually triggered by npc_spellclick) that spawn a vehicle and that cause the clicker
|
||||
// to cast a ride vehicle spell on the summoned unit.
|
||||
float x, y, z;
|
||||
m_caster->GetClosePoint(x, y, z, DEFAULT_WORLD_OBJECT_SIZE);
|
||||
summon = m_originalCaster->GetMap()->SummonCreature(entry, *destTarget, properties, duration, m_caster, m_spellInfo->Id);
|
||||
if (!summon || !summon->IsVehicle())
|
||||
return;
|
||||
@@ -3087,7 +3084,7 @@ void Spell::EffectWeaponDmg(SpellEffIndex effIndex)
|
||||
// Blood-Caked Strike - Blood-Caked Blade
|
||||
if (m_spellInfo->SpellIconID == 1736)
|
||||
{
|
||||
AddPct(totalDamagePercentMod, unitTarget->GetDiseasesByCaster(m_caster->GetGUID()) * 12.5f);
|
||||
AddPct(totalDamagePercentMod, unitTarget->GetDiseasesByCaster(m_caster->GetGUID()) * 50.0f);
|
||||
break;
|
||||
}
|
||||
// Heart Strike
|
||||
@@ -5837,7 +5834,7 @@ void Spell::EffectBind(SpellEffIndex effIndex)
|
||||
player->SetHomebind(homeLoc, areaId);
|
||||
|
||||
// binding
|
||||
WorldPacket data(SMSG_BINDPOINTUPDATE, (4+4+4+4+4));
|
||||
WorldPacket data(SMSG_BINDPOINTUPDATE, 4 + 4 + 4 + 4 + 4);
|
||||
data << float(homeLoc.GetPositionX());
|
||||
data << float(homeLoc.GetPositionY());
|
||||
data << float(homeLoc.GetPositionZ());
|
||||
@@ -5849,8 +5846,8 @@ void Spell::EffectBind(SpellEffIndex effIndex)
|
||||
homeLoc.GetPositionX(), homeLoc.GetPositionY(), homeLoc.GetPositionZ(), homeLoc.GetMapId(), areaId);
|
||||
|
||||
// zone update
|
||||
data.Initialize(SMSG_PLAYERBOUND, 8+4);
|
||||
data << uint64(player->GetGUID());
|
||||
data.Initialize(SMSG_PLAYERBOUND, 8 + 4);
|
||||
data << uint64(m_caster->GetGUID());
|
||||
data << uint32(areaId);
|
||||
player->SendDirectMessage(&data);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user