Merge pull request #14 from inferno-collection/development

Public Beta Version 1.14
inferno-collection · Sep 28, 2023 · 6ae85c7 · 6ae85c7
2 parents 2f5787a + d6e80a9
commit 6ae85c7
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -1,4 +1,4 @@
-# Inferno Collection Ladders Reborn 1.13 Beta
+# Inferno Collection Ladders Reborn 1.14 Beta
 #
 # Copyright (c) 2019-2022, Christopher M, Inferno Collection. All rights reserved.
 #

diff --git a/Client/Main.cs b/Client/Main.cs
@@ -1,5 +1,5 @@
 /*
- * Inferno Collection Ladders Reborn 1.13 Beta
+ * Inferno Collection Ladders Reborn 1.14 Beta
  * 
  * Copyright (c) 2019-2022, Christopher M, Inferno Collection. All rights reserved.
  * 
@@ -199,6 +199,9 @@ internal async void OnCollect(int networkId)
             Tick += CarryingTick;
         }
 
+        [EventHandler("Inferno-Collection:Client:Ladders:Store")]
+        internal void OnStore() => _carryingLadder = null;
+
         [EventHandler("Inferno-Collection:Client:Ladders:Attach")]
         internal async void OnAttach(int playerId, int networkId, bool onBack = false)
         {

diff --git a/Client/fxmanifest.lua b/Client/fxmanifest.lua
@@ -1,4 +1,4 @@
--- Inferno Collection Ladders Reborn 1.13 Beta
+-- Inferno Collection Ladders Reborn 1.14 Beta
 --
 -- Copyright (c) 2019-2022, Christopher M, Inferno Collection. All rights reserved.
 --
@@ -15,7 +15,7 @@ description "OneSync Ladder script for FiveM."
 
 author "Inferno Collection (inferno-collection.com)"
 
-version "1.13 Beta"
+version "1.14 Beta"
 
 url "https://inferno-collection.com"
 

diff --git a/LICENCE.txt b/LICENCE.txt
@@ -1,4 +1,4 @@
-Inferno Collection Ladders Reborn 1.13 Beta
+Inferno Collection Ladders Reborn 1.14 Beta
 
 Copyright (c) 2019-2022, Christopher M, Inferno Collection. All rights reserved.
 

diff --git a/LaddersReborn.Shared/Models/Config.cs b/LaddersReborn.Shared/Models/Config.cs
@@ -1,5 +1,5 @@
 /*
- * Inferno Collection Ladders Reborn 1.13 Beta
+ * Inferno Collection Ladders Reborn 1.14 Beta
  * 
  * Copyright (c) 2019-2022, Christopher M, Inferno Collection. All rights reserved.
  * 

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 # Inferno Collection: Ladders - Reborn
 [![Build and Check](https://github.com/inferno-collection/Ladders-Reborn/actions/workflows/dotnet.yml/badge.svg?branch=master)](https://github.com/inferno-collection/Ladders-Reborn/actions/workflows/dotnet.yml)
 
-__Public Beta Version 1.13__
+__Public Beta Version 1.14__
 
 Following the release of the [original Ladders](https://github.com/inferno-collection/Ladders) back in 2019, Ladders - Reborn is the updated C# version boasting OneSync support, addon Ladder prop instead of replace, and more efficient code.
 

diff --git a/Server/Main.cs b/Server/Main.cs
@@ -1,5 +1,5 @@
 /*
- * Inferno Collection Ladders Reborn 1.13 Beta
+ * Inferno Collection Ladders Reborn 1.14 Beta
  * 
  * Copyright (c) 2019-2022, Christopher M, Inferno Collection. All rights reserved.
  * 
@@ -509,6 +509,7 @@ internal void StoreLadder(Player source)
                 }
 
                 source.State.Set("ICCarryingLadder", -1, true);
+                source.TriggerEvent("Inferno-Collection:Client:Ladders:Store");
 
                 _createdLadders.Remove(entity.Handle);