Skip to content

Commit b7698cd

Browse files
authored
fix: nw bug 1560 and 1816 (#774)
* fix: https://git.scpslgame.com/northwood-qa/scpsl-bug-reporting/-/issues/1560 * fix: SpawnProtect * Fix 1560 * update Using * fix: build error of using * fix: 2816 * Revert "fix: SpawnProtect" This reverts commit d938486. * removed fix by NW * fix: this wasn't fixed .
1 parent 73483b3 commit b7698cd

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

EXILED/Exiled.API/Features/Pickups/JailbirdPickup.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,9 @@ internal override void ReadItemInfo(Item item)
109109

110110
if (item is Jailbird jailBirditem)
111111
{
112+
// TODO: Remove if this is fixed https://git.scpslgame.com/northwood-qa/scpsl-bug-reporting/-/issues/2816
113+
jailBirditem.Base._deterioration.RecheckUsage();
114+
112115
MeleeDamage = jailBirditem.MeleeDamage;
113116
ChargeDamage = jailBirditem.ChargeDamage;
114117
FlashDuration = jailBirditem.FlashDuration;

EXILED/Exiled.Events/Handlers/Internal/Round.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ namespace Exiled.Events.Handlers.Internal
1515
using Exiled.API.Extensions;
1616
using Exiled.API.Features;
1717
using Exiled.API.Features.Core.UserSettings;
18+
using Exiled.API.Features.Doors;
1819
using Exiled.API.Features.Items;
1920
using Exiled.API.Features.Pools;
2021
using Exiled.API.Features.Roles;
@@ -23,17 +24,14 @@ namespace Exiled.Events.Handlers.Internal
2324
using Exiled.Events.EventArgs.Scp049;
2425
using Exiled.Loader;
2526
using Exiled.Loader.Features;
27+
using Interactables.Interobjects.DoorUtils;
2628
using InventorySystem;
2729
using InventorySystem.Items.Firearms.Attachments;
2830
using InventorySystem.Items.Firearms.Attachments.Components;
2931
using InventorySystem.Items.Usables;
30-
using InventorySystem.Items.Usables.Scp244.Hypothermia;
3132
using InventorySystem.Items.Usables.Scp330;
3233
using PlayerRoles;
33-
using PlayerRoles.FirstPersonControl;
3434
using PlayerRoles.RoleAssign;
35-
using UnityEngine;
36-
using Utils.Networking;
3735
using Utils.NonAllocLINQ;
3836

3937
/// <summary>
@@ -60,6 +58,10 @@ public static void OnWaitingForPlayers()
6058

6159
if (Events.Instance.Config.Debug)
6260
Patches.Events.Map.Generating.Benchmark();
61+
62+
// TODO: Remove when this has been fixed https://git.scpslgame.com/northwood-qa/scpsl-bug-reporting/-/issues/1560
63+
Door door = Door.Get(DoorType.Scp079Armory);
64+
door.AllowsScp106 = false;
6365
}
6466

6567
/// <inheritdoc cref="Handlers.Server.OnRestartingRound" />

EXILED/Exiled.Events/Patches/Fixes/Fix106ItemManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// -----------------------------------------------------------------------
1+
// -----------------------------------------------------------------------
22
// <copyright file="Fix106ItemManager.cs" company="ExMod Team">
33
// Copyright (c) ExMod Team. All rights reserved.
44
// Licensed under the CC BY-SA 3.0 license.

0 commit comments

Comments
 (0)