pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 21:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Fixes Personal Tributes for bard items not being applied. (#4414)" (#4415)

Browse Source 
This reverts commit 080abaede1cc110d122f6bf2d1986aca2b0e156f.
This commit is contained in:
Mitch Freeman 2024-07-16 11:49:08 -03:00 committed by GitHub
parent 080abaede1
commit 51eb95ed31
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
zone/bonuses.cpp
View File

@ -183,19 +183,13 @@ void Mob::CalcItemBonuses(StatBonuses* b) {
} }
if (IsOfClientBot()) { if (IsOfClientBot()) {
if (CastToClient()->GetPP().tribute_active) { for (i = EQ::invslot::TRIBUTE_BEGIN; i <= EQ::invslot::TRIBUTE_END; i++) {
for (auto const &t: CastToClient()->GetPP().tributes) { const EQ::ItemInstance* inst = m_inv[i];
auto item_id = CastToClient()->LookupTributeItemID(t.tribute, t.tier); if (!inst) {
if (item_id) { continue;
const EQ::ItemInstance *inst = database.CreateItem(item_id);
if (!inst) {
continue;
}
AddItemBonuses(inst, b, false, true);
safe_delete(inst);
}
} }
AddItemBonuses(inst, b, false, true);
} }
} }

3
zone/client.h
View File

@ -70,7 +70,6 @@ namespace EQ
#include "../common/data_verification.h" #include "../common/data_verification.h"
#include "../common/repositories/character_parcels_repository.h" #include "../common/repositories/character_parcels_repository.h"
#include "../common/repositories/trader_repository.h" #include "../common/repositories/trader_repository.h"
#include "../common/guild_base.h"
#ifdef _WINDOWS #ifdef _WINDOWS
// since windows defines these within windef.h (which windows.h include) // since windows defines these within windef.h (which windows.h include)
@ -968,8 +967,6 @@ public:
void ChangeTributeSettings(TributeInfo_Struct *t); void ChangeTributeSettings(TributeInfo_Struct *t);
void SendTributeTimer(); void SendTributeTimer();
void ToggleTribute(bool enabled); void ToggleTribute(bool enabled);
std::map<uint32, TributeData> GetTributeList();
uint32 LookupTributeItemID(uint32 tribute_id, uint32 tier);
void SendPathPacket(const std::vector<FindPerson_Point> &path); void SendPathPacket(const std::vector<FindPerson_Point> &path);
inline PTimerList &GetPTimers() { return(p_timers); } inline PTimerList &GetPTimers() { return(p_timers); }

22
zone/tribute.cpp
View File

@ -48,7 +48,7 @@ but I dont see a point to that right now, so I dont do it.
*/ */
extern WorldServer worldserver; extern WorldServer worldserver;
std::map<uint32, TributeData> tribute_list{}; std::map<uint32, TributeData> tribute_list;
void Client::ToggleTribute(bool enabled) { void Client::ToggleTribute(bool enabled) {
if(enabled) { if(enabled) {
@ -622,26 +622,6 @@ void Client::SendGuildTributeDonatePlatReply(GuildTributeDonatePlatRequest_Struc
} }
std::map<uint32, TributeData> Client::GetTributeList() {
return tribute_list;
}
uint32 Client::LookupTributeItemID(uint32 tribute_id, uint32 tier)
{
if (!tribute_id && !tier) {
return 0;
}
if (tribute_list.contains(tribute_id)) {
auto tribute = tribute_list.find(tribute_id);
auto item_id = tribute->second.tiers[tier].tribute_item_id;
if (!item_id) {
return 0;
}
return item_id;
}
}
/* /*
64.37.149.6:1353 == server 64.37.149.6:1353 == server
66.90.221.245:3173 == client 66.90.221.245:3173 == client