From 796777949204d4c8aca0898d5d05311d0c580927 Mon Sep 17 00:00:00 2001
From: Beu <benoit@virtit.fr>
Date: Fri, 30 Jun 2023 18:22:20 +0200
Subject: [PATCH] Add new properties

---
 .../TrackMania/OnWayPointEventStructure.php   | 60 +++++++++++++++----
 1 file changed, 50 insertions(+), 10 deletions(-)

diff --git a/core/Callbacks/Structures/TrackMania/OnWayPointEventStructure.php b/core/Callbacks/Structures/TrackMania/OnWayPointEventStructure.php
index 358cbc6e..468bdd4d 100644
--- a/core/Callbacks/Structures/TrackMania/OnWayPointEventStructure.php
+++ b/core/Callbacks/Structures/TrackMania/OnWayPointEventStructure.php
@@ -21,6 +21,10 @@ class OnWayPointEventStructure extends BasePlayerTimeStructure {
 	private $stuntsScore;
 	private $checkPointInRace;
 	private $checkPointInLap;
+	private $curRaceCheckpoints;
+	private $curLapCheckpoints;
+	private $isInfiniteLaps;
+	private $isIndependentLaps;
 	private $isEndRace;
 	private $isEndLap;
 	private $blockId;
@@ -37,16 +41,20 @@ class OnWayPointEventStructure extends BasePlayerTimeStructure {
 	public function __construct(ManiaControl $maniaControl, $data) {
 		parent::__construct($maniaControl, $data);
 
-		$this->raceTime         = (int) $this->getPlainJsonObject()->racetime;
-		$this->lapTime          = (int) $this->getPlainJsonObject()->laptime;
-		$this->stuntsScore      = isset($this->getPlainJsonObject()->stuntsscore) ? $this->getPlainJsonObject()->stuntsscore : null;
-		$this->checkPointInRace = (int) $this->getPlainJsonObject()->checkpointinrace;
-		$this->checkPointInLap  = (int) $this->getPlainJsonObject()->checkpointinlap;
-		$this->isEndRace        = Formatter::parseBoolean($this->getPlainJsonObject()->isendrace);
-		$this->isEndLap         = Formatter::parseBoolean($this->getPlainJsonObject()->isendlap);
-		$this->blockId          = $this->getPlainJsonObject()->blockid;
-		$this->speed            = $this->getPlainJsonObject()->speed;
-		$this->distance         = isset($this->getPlainJsonObject()->distance) ? $this->getPlainJsonObject()->distance : null;
+		$this->raceTime             = (int) $this->getPlainJsonObject()->racetime;
+		$this->lapTime              = (int) $this->getPlainJsonObject()->laptime;
+		$this->stuntsScore          = isset($this->getPlainJsonObject()->stuntsscore) ? $this->getPlainJsonObject()->stuntsscore : null;
+		$this->checkPointInRace     = (int) $this->getPlainJsonObject()->checkpointinrace;
+		$this->checkPointInLap      = (int) $this->getPlainJsonObject()->checkpointinlap;
+		$this->curRaceCheckpoints   = isset($this->getPlainJsonObject()->curracecheckpoints) ? $this->getPlainJsonObject()->curracecheckpoints : null;
+		$this->curLapCheckpoints    = isset($this->getPlainJsonObject()->curlapcheckpoints) ? $this->getPlainJsonObject()->curlapcheckpoints : null;
+		$this->isInfiniteLaps       = isset($this->getPlainJsonObject()->isinfinitelaps) ? Formatter::parseBoolean($this->getPlainJsonObject()->isinfinitelaps) : null;
+		$this->isIndependentLaps    = isset($this->getPlainJsonObject()->isindependentlaps) ? Formatter::parseBoolean($this->getPlainJsonObject()->isindependentlaps) : null;
+		$this->isEndRace            = Formatter::parseBoolean($this->getPlainJsonObject()->isendrace);
+		$this->isEndLap             = Formatter::parseBoolean($this->getPlainJsonObject()->isendlap);
+		$this->blockId              = $this->getPlainJsonObject()->blockid;
+		$this->speed                = $this->getPlainJsonObject()->speed;
+		$this->distance             = isset($this->getPlainJsonObject()->distance) ? $this->getPlainJsonObject()->distance : null;
 
 		if ($this->checkPointInRace > 0) {
 			$currentMap      = $this->maniaControl->getMapManager()->getCurrentMap();
@@ -94,6 +102,38 @@ class OnWayPointEventStructure extends BasePlayerTimeStructure {
 		return $this->checkPointInLap;
 	}
 
+	/**
+	 * @api
+	 * @return array|null
+	 */
+	public function getCurRaceCheckpoints() {
+		return $this->curRaceCheckpoints;
+	}
+
+	/**
+	 * @api
+	 * @return array|null
+	 */
+	public function getCurLapCheckpoints() {
+		return $this->curLapCheckpoints;
+	}
+
+	/**
+	 * @api
+	 * @return bool|null
+	 */
+	public function getIsInfiniteLaps() {
+		return $this->isInfiniteLaps;
+	}
+
+	/**
+	 * @api
+	 * @return bool|null
+	 */
+	public function getIsIndependentLaps() {
+		return $this->isIndependentLaps;
+	}
+
 	/**
 	 * @api
 	 * @return mixed