pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +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
3 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/lua_client.cpp
+11 -13
View File
@@ -1214,25 +1214,23 @@ void Lua_Client::AddPVPPoints(uint32 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();
if (ebon != 0) {
if (ebon > 0) {
self->AddEbonCrystals(ebon);
return;
if (ebon_count != 0) {
if (ebon_count > 0) {
self->AddEbonCrystals(ebon_count);
} else {
self->RemoveEbonCrystals(ebon_count);
}
self->RemoveEbonCrystals(ebon);
}
if (radiant != 0) {
if (radiant > 0) {
self->AddRadiantCrystals(radiant);
return;
if (radiant_count != 0) {
if (radiant_count > 0) {
self->AddRadiantCrystals(radiant_count);
} else {
self->RemoveRadiantCrystals(radiant_count);
}
self->RemoveRadiantCrystals(radiant);
}
}
zone/lua_client.h
+1 -1
View File
@@ -316,7 +316,7 @@ public:
void KeyRingAdd(uint32 item);
bool KeyRingCheck(uint32 item);
void AddPVPPoints(uint32 points);
void AddCrystals(uint32 radiant, uint32 ebon);
void AddCrystals(uint32 radiant_count, uint32 ebon_count);
void SetEbonCrystals(uint32 value);
void SetRadiantCrystals(uint32 value);
uint32 GetPVPPoints();
zone/perl_client.cpp
+4 -6
View File
@@ -1162,19 +1162,17 @@ void Perl_Client_AddCrystals(Client* self, uint32 radiant_count, uint32 ebon_cou
if (ebon_count != 0) {
if (ebon_count > 0) {
self->AddEbonCrystals(ebon_count);
return;
} else {
self->RemoveEbonCrystals(ebon_count);
}
self->RemoveEbonCrystals(ebon_count);
}
if (radiant_count != 0) {
if (radiant_count > 0) {
self->AddRadiantCrystals(radiant_count);
return;
} else {
self->RemoveRadiantCrystals(radiant_count);
}
self->RemoveRadiantCrystals(radiant_count);
}
}