From abc8792a9d31e8fe895909f4886d7b823be841a6 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Wed, 28 Apr 2021 21:27:19 -0500
Subject: [PATCH] Fix garbage route payout

---
 scripts/server/job/garbage.js | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/scripts/server/job/garbage.js b/scripts/server/job/garbage.js
index e8cd8c4b..7276d140 100644
--- a/scripts/server/job/garbage.js
+++ b/scripts/server/job/garbage.js
@@ -117,14 +117,7 @@ function showCurrentGarbageStop(client) {
 
 function playerArrivedAtGarbageStop(client) {
     if(isLastStopOnGarbageRoute(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute, getPlayerData(client).jobRouteStop)) {
-        respawnVehicle(getPlayerData(client).jobRouteVehicle);
-        getPlayerData(client).payDayAmount += getGarbageRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout*getServerData().inflationMultiplier;
-        messagePlayerNormal(client, `You finished the ${getGarbageRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).name} garbage route! Your trashmaster has been returned to the garbage depot.`, getColourByName("yellow"));
-        messagePlayerNormal(client, `You earned $${getGarbageRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout*getServerData().inflationMultiplier}. Your total paycheck of [#AAAAAA]${getPlayerData(client).payDayAmount} will be received in [#AAAAAA]${getTimeDifferenceDisplay(sdl.ticks-getPlayerData(client).payDayTickStart)}: $${getPlayerData(client).payDayAmount}`);
-		getPlayerData(client).jobRouteVehicle = false;
-		getPlayerData(client).jobRoute = 0;
-		getPlayerData(client).jobRouteStop = 0;
-		getPlayerData(client).jobRouteIsland = 0;
+        finishSuccessfulGarbageRoute(client);
         return false;
     }
 
@@ -149,4 +142,18 @@ function getGarbageRouteData(island, garbageRoute) {
     return garbageRoutes[getServerGame()][island][garbageRoute];
 }
 
+// ===========================================================================
+
+function finishSuccessfulGarbageRoute(client) {
+    respawnVehicle(getPlayerData(client).jobRouteVehicle);
+    let payout = toInteger(applyServerInflationMultiplier(getGarbageRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout));
+    getPlayerData(client).payDayAmount = getPlayerData(client).payDayAmount + payout;
+    messagePlayerNormal(client, `You finished the ${getGarbageRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).name} garbage route! Your trashmaster has been returned to the garbage depot.`, getColourByName("yellow"));
+    messagePlayerNormal(client, `You earned $${getGarbageRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout*getServerData().inflationMultiplier}. Your total paycheck of [#AAAAAA]${getPlayerData(client).payDayAmount} will be received in [#AAAAAA]${getTimeDifferenceDisplay(sdl.ticks-getPlayerData(client).payDayTickStart)}: $${getPlayerData(client).payDayAmount}`);
+    getPlayerData(client).jobRouteVehicle = false;
+    getPlayerData(client).jobRoute = 0;
+    getPlayerData(client).jobRouteStop = 0;
+    getPlayerData(client).jobRouteIsland = 0;
+}
+
 // ===========================================================================
\ No newline at end of file