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

[Bug Fix] Fix Character Recast Type -1 saving to database. (#1598)

Browse Source
This commit is contained in:
Kinglykrab 2021-10-16 15:10:42 -04:00 committed by GitHub
parent 5d522b149b
commit 07d96ad921
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/item_data.h
View File

@ -482,7 +482,7 @@ namespace EQ
uint32 Haste; uint32 Haste;
uint32 DamageShield; uint32 DamageShield;
uint32 RecastDelay; uint32 RecastDelay;
uint32 RecastType; int RecastType;
uint32 AugDistiller; uint32 AugDistiller;
bool Attuneable; bool Attuneable;
bool NoPet; bool NoPet;

2
common/shareddb.cpp
View File

@ -1118,7 +1118,7 @@ void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_
item.Haste = (uint32)atoul(row[ItemField::haste]); item.Haste = (uint32)atoul(row[ItemField::haste]);
item.DamageShield = (uint32)atoul(row[ItemField::damageshield]); item.DamageShield = (uint32)atoul(row[ItemField::damageshield]);
item.RecastDelay = (uint32)atoul(row[ItemField::recastdelay]); item.RecastDelay = (uint32)atoul(row[ItemField::recastdelay]);
item.RecastType = (uint32)atoul(row[ItemField::recasttype]); item.RecastType = (int)atoi(row[ItemField::recasttype]);
item.GuildFavor = (uint32)atoul(row[ItemField::guildfavor]); item.GuildFavor = (uint32)atoul(row[ItemField::guildfavor]);
item.AugDistiller = (uint32)atoul(row[ItemField::augdistiller]); item.AugDistiller = (uint32)atoul(row[ItemField::augdistiller]);
item.Attuneable = (atoi(row[ItemField::attuneable]) == 0) ? false : true; item.Attuneable = (atoi(row[ItemField::attuneable]) == 0) ? false : true;

19
zone/spells.cpp
View File

@ -1338,7 +1338,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
bool fromaug = false; bool fromaug = false;
EQ::ItemData* augitem = nullptr; EQ::ItemData* augitem = nullptr;
uint32 recastdelay = 0; uint32 recastdelay = 0;
uint32 recasttype = 0; int recasttype = 0;
while (true) { while (true) {
if (item == nullptr) if (item == nullptr)
@ -1378,8 +1378,13 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
{ {
//Can we start the timer here? I don't see why not. //Can we start the timer here? I don't see why not.
CastToClient()->GetPTimers().Start((pTimerItemStart + recasttype), recastdelay); CastToClient()->GetPTimers().Start((pTimerItemStart + recasttype), recastdelay);
database.UpdateItemRecastTimestamps(CastToClient()->CharacterID(), recasttype, if (recasttype != -1) {
CastToClient()->GetPTimers().Get(pTimerItemStart + recasttype)->GetReadyTimestamp()); database.UpdateItemRecastTimestamps(
CastToClient()->CharacterID(),
recasttype,
CastToClient()->GetPTimers().Get(pTimerItemStart + recasttype)->GetReadyTimestamp()
);
}
} }
} }
@ -2539,9 +2544,13 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
if(itm && itm->GetItem()->RecastDelay > 0){ if(itm && itm->GetItem()->RecastDelay > 0){
auto recast_type = itm->GetItem()->RecastType; auto recast_type = itm->GetItem()->RecastType;
CastToClient()->GetPTimers().Start((pTimerItemStart + recast_type), itm->GetItem()->RecastDelay); CastToClient()->GetPTimers().Start((pTimerItemStart + recast_type), itm->GetItem()->RecastDelay);
if (recast_type != -1) {
database.UpdateItemRecastTimestamps( database.UpdateItemRecastTimestamps(
CastToClient()->CharacterID(), recast_type, CastToClient()->CharacterID(),
CastToClient()->GetPTimers().Get(pTimerItemStart + recast_type)->GetReadyTimestamp()); recast_type,
CastToClient()->GetPTimers().Get(pTimerItemStart + recast_type)->GetReadyTimestamp()
);
}
auto outapp = new EQApplicationPacket(OP_ItemRecastDelay, sizeof(ItemRecastDelay_Struct)); auto outapp = new EQApplicationPacket(OP_ItemRecastDelay, sizeof(ItemRecastDelay_Struct));
ItemRecastDelay_Struct *ird = (ItemRecastDelay_Struct *)outapp->pBuffer; ItemRecastDelay_Struct *ird = (ItemRecastDelay_Struct *)outapp->pBuffer;
ird->recast_delay = itm->GetItem()->RecastDelay; ird->recast_delay = itm->GetItem()->RecastDelay;