Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Public Beta Version 1.14 #14

Merged
merged 3 commits into from
Sep 28, 2023
Merged

Public Beta Version 1.14 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4998fe7
Nullify `_carryingLadder` after ladder is stored
cm8263 Sep 28, 2023
164044c
Merge pull request #13 from inferno-collection/feature/fixLadderPickup
cm8263 Sep 28, 2023
d6e80a9
Version change 1.14
cm8263 Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
5 changes: 4 additions & 1 deletion Client/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
*
Expand Down Expand Up @@ -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)
{
Expand Down
4 changes: 2 additions & 2 deletions Client/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
--
Expand All @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion LICENCE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion LaddersReborn.Shared/Models/Config.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
*
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
3 changes: 2 additions & 1 deletion Server/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
*
Expand Down Expand Up @@ -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);

Expand Down
Loading