mirror of
https://github.com/EQEmu/Server.git
synced 2026-11-22 20:17:16 +00:00
Small fixes: Titanium overflow, LDoN/alt-currency sell-back, hover respawn, duels (#5127)
This commit is contained in:
1 parent
a572b03f56
commit
3c2c684c9d
8 files changed
+142
-18
No files matched your search
+12
-1
@@ -2242,6 +2242,10 @@ void Client::HandleRespawnFromHover(uint32 Option)
|
||||
|
||||
FastQueuePacket(&outapp);
|
||||
|
||||
// Client::SetMaxHP does nothing while dead is set, and ClearHover only clears it below,
|
||||
// so the respawn kept the death HP and the client bled out again.
|
||||
dead = false;
|
||||
|
||||
CalcBonuses();
|
||||
RestoreHealth();
|
||||
RestoreMana();
|
||||
@@ -2287,7 +2291,13 @@ void Client::HandleRespawnFromHover(uint32 Option)
|
||||
|
||||
Save();
|
||||
|
||||
MovePC(chosen->zone_id, chosen->instance_id, chosen->x, chosen->y, chosen->z, chosen->heading, 1);
|
||||
// The bind choice goes through the normal death-to-bind path, which sends OP_ZonePlayerToBind:
|
||||
// that packet is what closes the respawn window on newer clients.
|
||||
if (Option == 0 || default_to_bind) {
|
||||
MovePC(chosen->zone_id, chosen->instance_id, chosen->x, chosen->y, chosen->z, chosen->heading, 1, ZoneToBindPoint);
|
||||
} else {
|
||||
MovePC(chosen->zone_id, chosen->instance_id, chosen->x, chosen->y, chosen->z, chosen->heading, 1);
|
||||
}
|
||||
}
|
||||
|
||||
safe_delete(default_to_bind);
|
||||
@@ -2297,6 +2307,7 @@ void Client::ClearHover()
|
||||
{
|
||||
// Our Entity ID is currently zero, set in Client::Death
|
||||
SetID(entity_list.GetFreeID());
|
||||
entity_list.ReKeyClient(this);
|
||||
|
||||
auto outapp = new EQApplicationPacket(OP_ZoneEntry, sizeof(ServerZoneEntry_Struct));
|
||||
ServerZoneEntry_Struct* sze = (ServerZoneEntry_Struct*)outapp->pBuffer;
|
||||
|
||||
Reference in new issue
Block a user