*Different creature searcher method for Dalaran Mageguards, thanks manuel

*Fix a minor typo in recent AH change that (probably) prevented anybody from bidding, sorry D:

--HG--
branch : trunk
This commit is contained in:
maximius
2009-11-20 15:06:21 -08:00
parent f18767dc77
commit 4072c0bdbf
2 changed files with 13 additions and 13 deletions
@@ -73,24 +73,24 @@ struct TRINITY_DLL_DECL npc_mageguard_dalaranAI : public Scripted_NoMovementAI
switch (m_creature->GetEntry()) switch (m_creature->GetEntry())
{ {
case 29254: case 29254:
if (pPlayer->GetTeam() == HORDE) if (pPlayer->GetTeam() == HORDE) // Horde unit found in Alliance area
if (Creature *pOutdoorNPC = me->FindNearestCreature(NPC_APPLEBOUGH_A, 35.0f)) if (Creature *pOutdoorNPC = GetClosestCreatureWithEntry(me, NPC_APPLEBOUGH_A, 35.0f))
{ {
if (me->isInBackInMap(pWho, 12.0f)) if (me->isInBackInMap(pWho, 12.0f)) // In my line of sight, "outdoors", and behind me
DoCast(pWho, SPELL_TRESPASSER_A); DoCast(pWho, SPELL_TRESPASSER_A); // Teleport the Horde unit out
} }
else // In my line of sight, and "indoors" else // In my line of sight, and "indoors"
DoCast(pWho, SPELL_TRESPASSER_A); // Teleport the Horde unit out DoCast(pWho, SPELL_TRESPASSER_A); // Teleport the Horde unit out
break; break;
case 29255: case 29255:
if (pPlayer->GetTeam() == ALLIANCE) if (pPlayer->GetTeam() == ALLIANCE) // Alliance unit found in Horde area
if (Creature *pOutdoorNPC = me->FindNearestCreature(NPC_SWEETBERRY_H, 35.0f)) if (Creature *pOutdoorNPC = GetClosestCreatureWithEntry(me, NPC_SWEETBERRY_H, 35.0f))
{ {
if (me->isInBackInMap(pWho, 12.0f)) if (me->isInBackInMap(pWho, 12.0f)) // In my line of sight, "outdoors", and behind me
DoCast(pWho, SPELL_TRESPASSER_H); DoCast(pWho, SPELL_TRESPASSER_H); // Teleport the Alliance unit out
} }
else // In my line of sight, and "indoors" else // In my line of sight, and "indoors"
DoCast(pWho, SPELL_TRESPASSER_H); // Teleport the Alliance unit out DoCast(pWho, SPELL_TRESPASSER_H); // Teleport the Alliance unit out
break; break;
} }
me->SetOrientation(me->GetHomePosition().GetOrientation()); me->SetOrientation(me->GetHomePosition().GetOrientation());
+1 -1
View File
@@ -326,7 +326,7 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recv_data)
} }
// cheating // cheating
if (price <= auction->bid || price <= auction->startbid) if (price <= auction->bid || price < auction->startbid)
return; return;
// price too low for next bid if not buyout // price too low for next bid if not buyout