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

[Zoning] Revert #2424 (#2492)

Browse Source
This commit is contained in:
Chris Miles 2022-10-15 20:48:15 -05:00 committed by GitHub
parent bd302b8394
commit dea94ce63d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zone/client_packet.cpp
View File

@ -909,10 +909,6 @@ void Client::CompleteConnect()
GoToSafeCoords(ZoneID("arena"), 0); GoToSafeCoords(ZoneID("arena"), 0);
return; return;
} }
// force resending of position when finally complete
// in hopes to alleviating race condition under-world issues
MovePC(zone->GetZoneID(), zone->GetInstanceID(), GetX(), GetY(), GetZ(), GetHeading());
} }
// connecting opcode handlers // connecting opcode handlers
@ -8924,10 +8920,10 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
else if (item->ItemType == EQ::item::ItemTypeSpell) else if (item->ItemType == EQ::item::ItemTypeSpell)
{ {
spell_id = item->Scroll.Effect; spell_id = item->Scroll.Effect;
if (RuleB(Spells, AllowSpellMemorizeFromItem)) if (RuleB(Spells, AllowSpellMemorizeFromItem))
{ {
int highest_spell_id = GetHighestScribedSpellinSpellGroup(spells[spell_id].spell_group); int highest_spell_id = GetHighestScribedSpellinSpellGroup(spells[spell_id].spell_group);
if (spells[spell_id].spell_group > 0 && highest_spell_id > 0) if (spells[spell_id].spell_group > 0 && highest_spell_id > 0)
{ {
if (spells[spell_id].rank > spells[highest_spell_id].rank) if (spells[spell_id].rank > spells[highest_spell_id].rank)
{ {
@ -8936,12 +8932,12 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
SetEntityVariable("spell_id",itoa(item->ID)); SetEntityVariable("spell_id",itoa(item->ID));
SendPopupToClient("", message.c_str(), 1000001, 1, 10); SendPopupToClient("", message.c_str(), 1000001, 1, 10);
return; return;
} }
else if (spells[spell_id].rank < spells[highest_spell_id].rank) else if (spells[spell_id].rank < spells[highest_spell_id].rank)
{ {
MessageString(Chat::Red, LESSER_SPELL_VERSION, spells[spell_id].name, spells[highest_spell_id].name); MessageString(Chat::Red, LESSER_SPELL_VERSION, spells[spell_id].name, spells[highest_spell_id].name);
return; return;
} }
} }
DeleteItemInInventory(slot_id, 1, true); DeleteItemInInventory(slot_id, 1, true);
MemorizeSpellFromItem(item->ID); MemorizeSpellFromItem(item->ID);