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

[Bug Fix] Fix AddCrystals() in Perl/Lua (#4445)

Browse Source
This commit is contained in:
Alex King 2024-08-09 22:48:32 -04:00 committed by GitHub
parent 6296ed6d41
commit f475cecdb1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
zone/lua_client.cpp
View File

@ -1214,25 +1214,23 @@ void Lua_Client::AddPVPPoints(uint32 points) {
self->AddPVPPoints(points); self->AddPVPPoints(points);
} }
void Lua_Client::AddCrystals(uint32 radiant, uint32 ebon) { void Lua_Client::AddCrystals(uint32 radiant_count, uint32 ebon_count) {
Lua_Safe_Call_Void(); Lua_Safe_Call_Void();
if (ebon != 0) { if (ebon_count != 0) {
if (ebon > 0) { if (ebon_count > 0) {
self->AddEbonCrystals(ebon); self->AddEbonCrystals(ebon_count);
return; } else {
self->RemoveEbonCrystals(ebon_count);
}
} }
self->RemoveEbonCrystals(ebon); if (radiant_count != 0) {
if (radiant_count > 0) {
self->AddRadiantCrystals(radiant_count);
} else {
self->RemoveRadiantCrystals(radiant_count);
} }
if (radiant != 0) {
if (radiant > 0) {
self->AddRadiantCrystals(radiant);
return;
}
self->RemoveRadiantCrystals(radiant);
} }
} }

2
zone/lua_client.h
View File

@ -316,7 +316,7 @@ public:
void KeyRingAdd(uint32 item); void KeyRingAdd(uint32 item);
bool KeyRingCheck(uint32 item); bool KeyRingCheck(uint32 item);
void AddPVPPoints(uint32 points); void AddPVPPoints(uint32 points);
void AddCrystals(uint32 radiant, uint32 ebon); void AddCrystals(uint32 radiant_count, uint32 ebon_count);
void SetEbonCrystals(uint32 value); void SetEbonCrystals(uint32 value);
void SetRadiantCrystals(uint32 value); void SetRadiantCrystals(uint32 value);
uint32 GetPVPPoints(); uint32 GetPVPPoints();

10
zone/perl_client.cpp
View File

@ -1162,20 +1162,18 @@ void Perl_Client_AddCrystals(Client* self, uint32 radiant_count, uint32 ebon_cou
if (ebon_count != 0) { if (ebon_count != 0) {
if (ebon_count > 0) { if (ebon_count > 0) {
self->AddEbonCrystals(ebon_count); self->AddEbonCrystals(ebon_count);
return; } else {
}
self->RemoveEbonCrystals(ebon_count); self->RemoveEbonCrystals(ebon_count);
} }
}
if (radiant_count != 0) { if (radiant_count != 0) {
if (radiant_count > 0) { if (radiant_count > 0) {
self->AddRadiantCrystals(radiant_count); self->AddRadiantCrystals(radiant_count);
return; } else {
}
self->RemoveRadiantCrystals(radiant_count); self->RemoveRadiantCrystals(radiant_count);
} }
}
} }
void Perl_Client_SetEbonCrystals(Client* self, uint32 value) void Perl_Client_SetEbonCrystals(Client* self, uint32 value)