OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-22 05:20:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent players from collecting the same pod twice in races

Browse Source 
Instead of ringCount, there is now a set of all ring IDs collected during the race.

Note: further validation measures are still required to ensure legitimate times/scores
This commit is contained in:
CakeLancelot 2021-04-13 21:17:21 -05:00
parent 9b84d9dc4d
commit fde4a5ff34
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Racing.cpp
View File

@ -23,7 +23,7 @@ static void racingStart(CNSocket* sock, CNPacketData* data) {
return; // IZ not found return; // IZ not found
// make ongoing race entry // make ongoing race entry
EPRace race = { 0, req->iEPRaceMode, req->iEPTicketItemSlotNum, getTime() / 1000 }; EPRace race = { {}, req->iEPRaceMode, req->iEPTicketItemSlotNum, getTime() / 1000 };
EPRaces[sock] = race; EPRaces[sock] = race;
INITSTRUCT(sP_FE2CL_REP_EP_RACE_START_SUCC, resp); INITSTRUCT(sP_FE2CL_REP_EP_RACE_START_SUCC, resp);
@ -39,13 +39,17 @@ static void racingGetPod(CNSocket* sock, CNPacketData* data) {
auto req = (sP_CL2FE_REQ_EP_GET_RING*)data->buf; auto req = (sP_CL2FE_REQ_EP_GET_RING*)data->buf;
if (EPRaces[sock].collectedRings.count(req->iRingLID))
return; // can't collect the same ring twice
// without an anticheat system, we really don't have a choice but to honor the request // without an anticheat system, we really don't have a choice but to honor the request
EPRaces[sock].ringCount++; // TODO: proximity check so players can't cheat the race by replaying packets
EPRaces[sock].collectedRings.insert(req->iRingLID);
INITSTRUCT(sP_FE2CL_REP_EP_GET_RING_SUCC, resp); INITSTRUCT(sP_FE2CL_REP_EP_GET_RING_SUCC, resp);
resp.iRingLID = req->iRingLID; // could be used to check for proximity in the future resp.iRingLID = req->iRingLID;
resp.iRingCount_Get = EPRaces[sock].ringCount; resp.iRingCount_Get = EPRaces[sock].collectedRings.size();
sock->sendPacket(resp, P_FE2CL_REP_EP_GET_RING_SUCC); sock->sendPacket(resp, P_FE2CL_REP_EP_GET_RING_SUCC);
} }
@ -77,7 +81,7 @@ static void racingEnd(CNSocket* sock, CNPacketData* data) {
uint64_t now = getTime() / 1000; uint64_t now = getTime() / 1000;
int timeDiff = now - EPRaces[sock].startTime; int timeDiff = now - EPRaces[sock].startTime;
int score = 500 * EPRaces[sock].ringCount - 10 * timeDiff; int score = 500 * EPRaces[sock].collectedRings.size() - 10 * timeDiff;
if (score < 0) score = 0; // lol if (score < 0) score = 0; // lol
int fm = score * plr->level * (1.0f / 36) * 0.3f; int fm = score * plr->level * (1.0f / 36) * 0.3f;
@ -85,7 +89,7 @@ static void racingEnd(CNSocket* sock, CNPacketData* data) {
Database::RaceRanking postRanking = {}; Database::RaceRanking postRanking = {};
postRanking.EPID = EPData[mapNum].EPID; postRanking.EPID = EPData[mapNum].EPID;
postRanking.PlayerID = plr->iID; postRanking.PlayerID = plr->iID;
postRanking.RingCount = EPRaces[sock].ringCount; postRanking.RingCount = EPRaces[sock].collectedRings.size();
postRanking.Score = score; postRanking.Score = score;
postRanking.Time = timeDiff; postRanking.Time = timeDiff;
postRanking.Timestamp = getTimestamp(); postRanking.Timestamp = getTimestamp();

5
src/Racing.hpp
View File

@ -1,5 +1,7 @@
#pragma once #pragma once
#include <set>
#include "servers/CNShardServer.hpp" #include "servers/CNShardServer.hpp"
struct EPInfo { struct EPInfo {
@ -7,7 +9,8 @@ struct EPInfo {
}; };
struct EPRace { struct EPRace {
int ringCount, mode, ticketSlot; std::set<int> collectedRings;
int mode, ticketSlot;
time_t startTime; time_t startTime;
}; };