取消一些错误eluna依赖
This commit is contained in:
parent
efc3989fd2
commit
2cd5fffe0a
@ -18,7 +18,6 @@
|
||||
#include "mod_CustomPlayerDataManager/CustomPlayerDataManager.h"
|
||||
#include "mod_CustomCreature.h"
|
||||
#include "Reward.h"
|
||||
#include <ElunaUtility.h>
|
||||
#include <Tokenize.h>
|
||||
|
||||
// ========================================
|
||||
@ -496,7 +495,7 @@ void GuildWarDamageScript::RecordCreatureDamage(Player* player, Creature* creatu
|
||||
uint32 health = creature->GetHealth();
|
||||
uint32 actualDamage = (health <= damage) ? health : damage;
|
||||
|
||||
customCreature->SetDamToValue(GUID_LOPART(player->GetCharmerOrOwnerOrOwnGUID()), actualDamage);
|
||||
customCreature->SetDamToValue(player->GetCharmerOrOwnerOrOwnGUID().GetCounter(), actualDamage);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
#include "PlayerScript.h"
|
||||
#include <Chat.h>
|
||||
#include <SpellMgr.h>
|
||||
#include <ElunaUtility.h>
|
||||
|
||||
#include "mod_SMAddon.h"
|
||||
#include <GCAddon.h>
|
||||
@ -206,7 +205,7 @@ bool ModSMAddon::OnRecv(Player* player, std::string msg)
|
||||
uint64 ItemGuid = strtoull(sGCAddon->SplitStr(msg, 2).c_str(), nullptr, 10); // 客户端发来的物品Guid 并使用 strtoull 来处理 uint64 的转换
|
||||
|
||||
// 从ItemGuid中获取GUIDLow
|
||||
uint32 itemlowguid = GUID_LOPART(ItemGuid);
|
||||
uint32 itemlowguid = static_cast<uint32>(ItemGuid);
|
||||
|
||||
// 使用GUIDLow来查找物品
|
||||
Item* item = GetItemByGuidLow(player, itemlowguid);
|
||||
@ -483,7 +482,7 @@ bool ModSMAddon::OnRecv(Player* player, std::string msg)
|
||||
playerData->lastConfirmForgingEnchantItemTime = getMSTime();
|
||||
|
||||
uint64 ItemGuid = strtoull(sGCAddon->SplitStr(msg, 1).c_str(), nullptr, 10);
|
||||
uint32 itemlowguid = GUID_LOPART(ItemGuid);
|
||||
uint32 itemlowguid = static_cast<uint32>(ItemGuid);
|
||||
Item* item = GetItemByGuidLow(player, itemlowguid);
|
||||
if (!item)
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user