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.

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

v8.12.0-rc.3 #62

Merged
merged 31 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
7262f06
Merge pull request #23 from ExMod-Team/master
Jesus-QC Aug 1, 2024
c9654ee
uwu (#5)
VALERA771 Aug 1, 2024
6ebeac5
Merge pull request #26 from ExMod-Team/master
louis1706 Aug 2, 2024
5653733
AdminToy.List (#18)
louis1706 Aug 2, 2024
5a519a4
Fix `Jailbird::WearState` (#12)
louis1706 Aug 2, 2024
81c3652
Porting EXILED9 RespawnedTeam event. by.VALERA771 (#27)
YongAn404 Aug 2, 2024
1f2d209
Fix not returning null (#22)
louis1706 Aug 4, 2024
4e50826
RecontainedEventArgs more feature (#20)
louis1706 Aug 6, 2024
3ffe156
InteractingScp330.cs: Reduction of bloat code from original design. (…
Undid-Iridium Aug 6, 2024
e39238e
IScp330Event (#11)
louis1706 Aug 6, 2024
f1cc6f4
PR than i made (#9)
louis1706 Aug 6, 2024
eb046ac
[Events] Fix null reference (#15)
louis1706 Aug 6, 2024
a7354b7
Offline mode support (#19)
x3rt Aug 6, 2024
259cabb
Fix NW bugs (#32)
skyfr0676 Aug 6, 2024
26d1fcc
Useless Event (939 Placed Amnestic Cloud) (#40)
x3rt Aug 7, 2024
03d6bd7
Fix custom role classes giving custom ammo when they are not suppose …
TtroubleTT Aug 7, 2024
06cf2d7
`Item::<T>Get()` and `Pickup::<T>Get()` (#17)
louis1706 Aug 9, 2024
09de18b
FixNpcNoclip (#34)
louis1706 Aug 9, 2024
a1ae554
Implements more patches for RemovingHandcuffs event and adding Remove…
Misaka-ZeroTwo Aug 9, 2024
2c41d7d
Interacting scp330 compile fix (#43)
Undid-Iridium Aug 10, 2024
08a5deb
Trello is no more & more NW Fix & Fix IL Code on dev (#28)
louis1706 Aug 10, 2024
a3595e1
Additions (#29)
Misfiy Aug 11, 2024
fada367
`[EXILED::API]` Pickup::Category (#46)
NotZer0Two Aug 11, 2024
2ee9f46
Fix (#50)
NotZer0Two Aug 11, 2024
0e2bea5
Merge branch 'master' into dev
Misaka-ZeroTwo Aug 11, 2024
ee317e7
`[Exiled::API]` Removing breaking changes (#54)
VALERA771 Aug 12, 2024
e80c81c
Merge branch 'master' into dev
Misaka-ZeroTwo Aug 12, 2024
b66b2fd
`Scp330` sound fix (#55)
IRacle1 Aug 12, 2024
0ab9037
Fix Npc (#58)
Misfiy Aug 12, 2024
f7b28f4
Merge branch 'master' into dev
Misaka-ZeroTwo Aug 13, 2024
119f930
Fix breaking change (#61)
Misaka-ZeroTwo Aug 13, 2024
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
12 changes: 4 additions & 8 deletions EXILED/Exiled.API/Features/Npc.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,22 @@
// </copyright>
// -----------------------------------------------------------------------

#nullable enable
namespace Exiled.API.Features
{
#nullable enable
using System;
using System.Collections.Generic;
using System.Linq;

using CommandSystem;

using Exiled.API.Enums;
using Exiled.API.Extensions;
using Exiled.API.Features.Components;
using Exiled.API.Features.Roles;
using Footprinting;

using MEC;

using Mirror;

using PlayerRoles;

using UnityEngine;

using Object = UnityEngine.Object;
Expand Down Expand Up @@ -60,8 +56,8 @@ public override Vector3 Position
set
{
base.Position = value;
if (Role is Roles.FpcRole fpcRole)
fpcRole.RelativePosition = new(value);
if (Role is FpcRole fpcRole)
fpcRole.ClientRelativePosition = new(value);
}
}

Expand Down
9 changes: 9 additions & 0 deletions EXILED/Exiled.API/Features/Player.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2478,6 +2478,15 @@ public void ResetAmmoLimit(AmmoType ammoType)
/// <returns>If the player has a custom limit for the specific <see cref="AmmoType"/>.</returns>
public bool HasCustomAmmoLimit(AmmoType ammoType) => CustomAmmoLimits.ContainsKey(ammoType);

/// <summary>
/// Gets the maximum amount of an <see cref="ItemCategory"/> the player can hold, based on the armor the player is wearing, as well as server configuration.
/// </summary>
/// <param name="category">The <see cref="ItemCategory"/> to check.</param>
/// <returns>The maximum amount of items in the category that the player can hold.</returns>
[Obsolete("Use Player::GetCategoryLimit(ItemCategory, bool) instead.")]
public int GetCategoryLimit(ItemCategory category) =>
InventorySystem.Configs.InventoryLimits.GetCategoryLimit(category, referenceHub);

/// <summary>
/// Gets the maximum amount of an <see cref="ItemCategory"/> the player can hold, based on the armor the player is wearing, as well as server configuration.
/// </summary>
Expand Down
Loading