diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bindings/scripts/scripts/northrend/dalaran.cpp | 24 | ||||
| -rw-r--r-- | src/game/AuctionHouseHandler.cpp | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/bindings/scripts/scripts/northrend/dalaran.cpp b/src/bindings/scripts/scripts/northrend/dalaran.cpp index 0367f128b22..2c41e3f5477 100644 --- a/src/bindings/scripts/scripts/northrend/dalaran.cpp +++ b/src/bindings/scripts/scripts/northrend/dalaran.cpp @@ -73,24 +73,24 @@ struct TRINITY_DLL_DECL npc_mageguard_dalaranAI : public Scripted_NoMovementAI switch (m_creature->GetEntry()) { case 29254: - if (pPlayer->GetTeam() == HORDE) - if (Creature *pOutdoorNPC = me->FindNearestCreature(NPC_APPLEBOUGH_A, 35.0f)) + if (pPlayer->GetTeam() == HORDE) // Horde unit found in Alliance area + if (Creature *pOutdoorNPC = GetClosestCreatureWithEntry(me, NPC_APPLEBOUGH_A, 35.0f)) { - if (me->isInBackInMap(pWho, 12.0f)) - DoCast(pWho, SPELL_TRESPASSER_A); + if (me->isInBackInMap(pWho, 12.0f)) // In my line of sight, "outdoors", and behind me + DoCast(pWho, SPELL_TRESPASSER_A); // Teleport the Horde unit out } - else // In my line of sight, and "indoors" - DoCast(pWho, SPELL_TRESPASSER_A); // Teleport the Horde unit out + else // In my line of sight, and "indoors" + DoCast(pWho, SPELL_TRESPASSER_A); // Teleport the Horde unit out break; case 29255: - if (pPlayer->GetTeam() == ALLIANCE) - if (Creature *pOutdoorNPC = me->FindNearestCreature(NPC_SWEETBERRY_H, 35.0f)) + if (pPlayer->GetTeam() == ALLIANCE) // Alliance unit found in Horde area + if (Creature *pOutdoorNPC = GetClosestCreatureWithEntry(me, NPC_SWEETBERRY_H, 35.0f)) { - if (me->isInBackInMap(pWho, 12.0f)) - DoCast(pWho, SPELL_TRESPASSER_H); + if (me->isInBackInMap(pWho, 12.0f)) // In my line of sight, "outdoors", and behind me + DoCast(pWho, SPELL_TRESPASSER_H); // Teleport the Alliance unit out } - else // In my line of sight, and "indoors" - DoCast(pWho, SPELL_TRESPASSER_H); // Teleport the Alliance unit out + else // In my line of sight, and "indoors" + DoCast(pWho, SPELL_TRESPASSER_H); // Teleport the Alliance unit out break; } me->SetOrientation(me->GetHomePosition().GetOrientation()); diff --git a/src/game/AuctionHouseHandler.cpp b/src/game/AuctionHouseHandler.cpp index 5ccdf02e0d1..06259d0d6b9 100644 --- a/src/game/AuctionHouseHandler.cpp +++ b/src/game/AuctionHouseHandler.cpp @@ -326,7 +326,7 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recv_data) } // cheating - if (price <= auction->bid || price <= auction->startbid) + if (price <= auction->bid || price < auction->startbid) return; // price too low for next bid if not buyout |