josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/TrinityCore/TrinityCore

Browse Source
This commit is contained in:
QAston
2011-06-26 13:56:11 +02:00
parent ac88fa026f bcd62b8d29
commit 557e06b1c1
13 changed files with 78 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Chat/Chat.cpp
-1
View File
@@ -206,7 +206,6 @@ ChatCommand * ChatHandler::getCommandTable()
{ "create", SEC_GAMEMASTER, false, OldHandler<&ChatHandler::HandleCreatePetCommand>, "", NULL },
{ "learn", SEC_GAMEMASTER, false, OldHandler<&ChatHandler::HandlePetLearnCommand>, "", NULL },
{ "unlearn", SEC_GAMEMASTER, false, OldHandler<&ChatHandler::HandlePetUnlearnCommand>, "", NULL },
{ "tp", SEC_GAMEMASTER, false, OldHandler<&ChatHandler::HandlePetTpCommand>, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
};
src/server/game/Chat/Chat.h
-1
View File
@@ -293,7 +293,6 @@ class ChatHandler
bool HandleHideAreaCommand(const char* args);
bool HandleAddItemCommand(const char* args);
bool HandleAddItemSetCommand(const char* args);
bool HandlePetTpCommand(const char* args);
bool HandlePetUnlearnCommand(const char* args);
bool HandlePetLearnCommand(const char* args);
bool HandleCreatePetCommand(const char* args);
src/server/game/Chat/Commands/Level2.cpp
-23
View File
@@ -913,29 +913,6 @@ bool ChatHandler::HandlePetUnlearnCommand(const char *args)
return true;
}
bool ChatHandler::HandlePetTpCommand(const char *args)
{
if (!*args)
return false;
Player *plr = m_session->GetPlayer();
Pet *pet = plr->GetPet();
if (!pet)
{
PSendSysMessage("You have no pet");
SetSentErrorMessage(true);
return false;
}
uint32 tp = atol(args);
//pet->SetTP(tp);
PSendSysMessage("Pet's tp changed to %u", tp);
return true;
}
bool ChatHandler::HandleLookupTitleCommand(const char* args)
{
if (!*args)
src/server/game/Entities/Unit/Unit.cpp
+8
View File
@@ -8718,6 +8718,8 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
// Deathbringer Saurfang - Rune of Blood
case 72408:
// can proc only if target is marked with rune
// this should be handled by targetAuraSpell, but because 72408 is not passive
// one failed proc will remove the entire aura
if (!pVictim->HasAura(72410))
return false;
break;
@@ -8725,6 +8727,12 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
case 72176:
basepoints0 = 3;
break;
// Deathbringer Saurfang - Mark of the Fallen Champion
case 72256:
// this should be handled by targetAuraSpell, but because 72408 is not passive
// one failed proc will remove the entire aura
CastSpell(NULL, trigger_spell_id, true, NULL, triggeredByAura);
return true;
case 15337: // Improved Spirit Tap (Rank 1)
case 15338: // Improved Spirit Tap (Rank 2)
{
src/server/game/Spells/SpellMgr.cpp
+5 -7
View File
@@ -4266,12 +4266,9 @@ void SpellMgr::LoadSpellCustomAttr()
spellInfo->EffectRadiusIndex[0] = 12; // 100yd
++count;
break;
case 72385: // Boiling Blood (Deathbringer Saurfang)
case 72441: // Boiling Blood (Deathbringer Saurfang)
case 72442: // Boiling Blood (Deathbringer Saurfang)
case 72443: // Boiling Blood (Deathbringer Saurfang)
spellInfo->EffectImplicitTargetA[0] = TARGET_UNIT_TARGET_ENEMY;
spellInfo->EffectImplicitTargetB[0] = 0;
case 72723: // Resistant Skin (Deathbringer Saurfang adds)
// this spell initially granted Shadow damage immunity, however it was removed but the data was left in client
spellInfo->Effect[2] = 0;
++count;
break;
case 70460: // Coldflame Jets (Traps after Saurfang)
@@ -4333,8 +4330,9 @@ void SpellMgr::LoadSpellCustomAttr()
spellInfo->EffectImplicitTargetB[0] = 0;
++count;
break;
case 72706: // Achievement Check (Valithria Dreamwalker)
case 71357: // Order Whelp
spellInfo->EffectRadiusIndex[0] = 22;
spellInfo->EffectRadiusIndex[0] = 22; // 200yd
++count;
break;
case 70598: // Sindragosa's Fury