diff --git a/src/PvPScript.cpp b/src/PvPScript.cpp index 2c1392d..518225d 100644 --- a/src/PvPScript.cpp +++ b/src/PvPScript.cpp @@ -1,13 +1,13 @@ +#include "AccountMgr.h" +#include "Chat.h" #include "Configuration/Config.h" -#include "Player.h" #include "Creature.h" -#include "AccountMgr.h" -#include "ScriptMgr.h" #include "Define.h" #include "GossipDef.h" -#include "Pet.h" #include "LootMgr.h" -#include "Chat.h" +#include "Pet.h" +#include "Player.h" +#include "ScriptMgr.h" uint32 SummonChest, KillAnnounce; bool spawnchestIP; @@ -17,7 +17,10 @@ std::vector AreatoIgnore = { 1741 /*Gurubashi*/, 2177 }; class PvPScript : public PlayerScript { public: - PvPScript() : PlayerScript("PvPScript") {} + PvPScript() : PlayerScript("PvPScript", { + PLAYERHOOK_ON_PLAYER_KILLED_BY_CREATURE, + PLAYERHOOK_ON_PVP_KILL + }) {} void OnPlayerKilledByCreature(Creature* killer, Player* killed/*, bool& durabilityLoss*/) { @@ -33,10 +36,8 @@ class PvPScript : public PlayerScript if (spawnchestIP) if (Pet* pet = killer->ToPet()) if (Player* owner = pet->GetOwner()) - { if (!CheckConditions(owner, killed)) return; - } if (!CheckConditions(nullptr, killed)) return; @@ -49,7 +50,7 @@ class PvPScript : public PlayerScript } } - void OnPVPKill(Player* killer, Player* killed) + void OnPlayerPVPKill(Player* killer, Player* killed) { if (!sConfigMgr->GetOption("PvPChest", true)) return;