Skip to content

Commit 309201a

Browse files
committed
Merge remote-tracking branch 'origin/main'
# Conflicts: # CustomItems/Configs/Items.cs # CustomItems/Properties/AssemblyInfo.cs
2 parents f0ce730 + 47cc5db commit 309201a

File tree

1 file changed

+1
-34
lines changed

1 file changed

+1
-34
lines changed

CustomItems/CustomItems.cs

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -46,24 +46,6 @@ public override void OnEnabled()
4646
harmonyInstance.PatchAll();
4747

4848
Config.LoadItems();
49-
/*
50-
Config.ItemConfigs.Scp127s.Register();
51-
Config.ItemConfigs.Scp714s.Register();
52-
Config.ItemConfigs.Scp1499s.Register();
53-
Config.ItemConfigs.Scp2818s.Register();
54-
Config.ItemConfigs.AutoGuns.Register();
55-
Config.ItemConfigs.C4Charges.Register();
56-
Config.ItemConfigs.DeflectorSheilds.Register();
57-
Config.ItemConfigs.EmpGrenades.Register();
58-
Config.ItemConfigs.GrenadeLaunchers.Register();
59-
Config.ItemConfigs.ImplosionGrenades.Register();
60-
Config.ItemConfigs.LethalInjections.Register();
61-
Config.ItemConfigs.LuckyCoins.Register();
62-
Config.ItemConfigs.MediGuns.Register();
63-
Config.ItemConfigs.SniperRifle.Register();
64-
Config.ItemConfigs.TranquilizerGun.Register();
65-
Config.ItemConfigs.AntiMemeticPills.Register();
66-
*/
6749

6850
Log.Debug("Registering items..", Config.IsDebugEnabled);
6951
CustomItem.RegisterItems(overrideClass: Config.ItemConfigs);
@@ -75,22 +57,7 @@ public override void OnEnabled()
7557
/// <inheritdoc/>
7658
public override void OnDisabled()
7759
{
78-
Config.ItemConfigs.Scp127s.Unregister();
79-
Config.ItemConfigs.Scp714s.Unregister();
80-
Config.ItemConfigs.Scp1499s.Unregister();
81-
Config.ItemConfigs.Scp2818s.Unregister();
82-
Config.ItemConfigs.AutoGuns.Unregister();
83-
Config.ItemConfigs.C4Charges.Unregister();
84-
Config.ItemConfigs.DeflectorSheilds.Unregister();
85-
Config.ItemConfigs.EmpGrenades.Unregister();
86-
Config.ItemConfigs.GrenadeLaunchers.Unregister();
87-
Config.ItemConfigs.ImplosionGrenades.Unregister();
88-
Config.ItemConfigs.LethalInjections.Unregister();
89-
Config.ItemConfigs.LuckyCoins.Unregister();
90-
Config.ItemConfigs.MediGuns.Unregister();
91-
Config.ItemConfigs.SniperRifle.Unregister();
92-
Config.ItemConfigs.TranquilizerGun.Unregister();
93-
Config.ItemConfigs.AntiMemeticPills.Unregister();
60+
CustomItem.UnregisterItems();
9461

9562
Server.ReloadedConfigs -= serverHandler.OnReloadingConfigs;
9663

0 commit comments

Comments
 (0)