Update script due to mta update

eXo-OpenSource · Aug 28, 2024 · d352243 · d352243
1 parent 7bb325d
commit d352243
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 14 deletions.
diff --git a/vrp/client/classes/Events/Christmas/Quests/QuestDraw.lua b/vrp/client/classes/Events/Christmas/Quests/QuestDraw.lua
@@ -81,7 +81,7 @@ function QuestDrawGUI:constructor(id, name)
 			self:showInfoText("Das Bild wird gespeichert...")
 
 			local options = {
-				["postData"] =  ("secret=%s&playerId=%d&contest=%s&img=%s"):format("8H041OAyGYk8wEpIa1Fv", localPlayer:getPrivateSync("Id"), name, base64Encode(self.m_Skribble:getImage("png"))),
+				["postData"] =  ("secret=%s&playerId=%d&contest=%s&img=%s"):format("8H041OAyGYk8wEpIa1Fv", localPlayer:getPrivateSync("Id"), name, encodeString("base64", self.m_Skribble:getImage("png"))),
 			}
 
 			fetchRemote(("%s/drawContest/upload.php%s"):format(PICUPLOAD_PATH, DEBUG and "?debug=true" or ""), options,

diff --git a/vrp/client/classes/HTTPProvider.lua b/vrp/client/classes/HTTPProvider.lua
@@ -182,7 +182,7 @@ function HTTPProvider:startCustom(fileName, targetPath, encrypt, raw)
 			local file = fileCreate(filePath)
 			if file then
 				if encrypt then
-					file:write(base64Encode(responseData))
+					file:write(encodeString("base64", responseData))
 				else
 					file:write(responseData)
 				end

diff --git a/vrp/server/classes/Gameplay/Jail.lua b/vrp/server/classes/Gameplay/Jail.lua
@@ -60,7 +60,6 @@ function Jail:createGate(interior, openDir, gatePos, gateRot, keypad1Pos, keypad
 	self.m_Gates[Id].m_Id = Id
 	self.m_Gates[Id]:setInterior(interior)
 	self.m_Gates[Id].closed = true
-	self.m_Gates[Id].moving = false
 	self.m_Gates[Id].m_OpenDirection = openDir
 
 	if keypad1Pos then
@@ -114,10 +113,6 @@ function Jail:moveGate(gate, forceClose)
 			gate.closed = true
 			--outputChatBox("Gate "..gate.m_Id.." geschlossen", nil, 255, 0, 0)
 		end
-		gate.moving = true
-		setTimer(function(gate)
-			gate.moving = false
-		end,1500, 1, gate)
 	end
 end
 

diff --git a/vrp/server/classes/Vehicles/Extensions/PayNSpray.lua b/vrp/server/classes/Vehicles/Extensions/PayNSpray.lua
@@ -99,7 +99,6 @@ end
 function PayNSpray:createCustomDoor(model, pos, rot)
 	self.m_CustomDoor = createObject(model, pos, rot)
 	self.m_CustomDoor.open = true
-	self.m_CustomDoor.moving = false
 end
 
 function PayNSpray:setCustomGarageOpen(state)
@@ -109,20 +108,16 @@ function PayNSpray:setCustomGarageOpen(state)
 			if not self.m_CustomDoor.open then
 				pos.z = pos.z+1.7
 				self.m_CustomDoor:move(2000, pos, Vector3(0, 90, 0))
-				self.m_CustomDoor.moving = true
 				setTimer(function()
 					self.m_CustomDoor.open = true
-					self.m_CustomDoor.moving = false
 				end, 2500, 1)
 			end
 		else
 			if self.m_CustomDoor.open then
 				pos.z = pos.z-1.7
 				self.m_CustomDoor:move(2000, pos, Vector3(0, -90, 0))
-				self.m_CustomDoor.moving = true
 				setTimer(function()
 					self.m_CustomDoor.open = false
-					self.m_CustomDoor.moving = false
 				end, 2500, 1)
 			end
 		end

diff --git a/vrp/server/classes/Vehicles/Super/TemporaryVehicle.lua b/vrp/server/classes/Vehicles/Super/TemporaryVehicle.lua
@@ -19,7 +19,7 @@ end
 
 function TemporaryVehicle.create(model, posX, posY, posZ, rotation)
 	rotation = tonumber(rotation) or 0
-	local vehicle = createVehicle(model, posX, posY, posZ, 0, 0, rotation)
+	local vehicle = createVehicle(model, Vector3(posX, posY, posZ), Vector3(0, 0, rotation))
 	if vehicle then
 		enew(vehicle, TemporaryVehicle)
 	end

diff --git a/vrp/server/migrations/Migration_20230707_2320_game_db.lua b/vrp/server/migrations/Migration_20230707_2320_game_db.lua
@@ -764,7 +764,7 @@ Migration_20230707_2320_game_db.Up = function()
       ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
       
       
-      CREATE TABLE IF NOT EXISTS `vrp_offlinemessage` (
+      CREATE TABLE IF NOT EXISTS `vrp_offlineMessage` (
         `Id` int(11) NOT NULL AUTO_INCREMENT,
         `PlayerId` int(11) NOT NULL,
         `Text` text NOT NULL,