Skip to content

Commit 73e2619

Browse files
authored
fix: fix copy paste stuff / pickups with CustomKeycardItem and CustomKeycardPickup (#644)
Fixes
1 parent a3bf7ad commit 73e2619

File tree

6 files changed

+8
-6
lines changed

6 files changed

+8
-6
lines changed

EXILED/Exiled.API/Features/Items/Keycards/MetalKeycard.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public string SerialNumber
112112
/// <returns>The new <see cref="MetalKeycard"/>.</returns>
113113
public static MetalKeycard Create(KeycardLevels keycardLevels, Color permissionsColor, string itemName, Color color, string nameTag, string label, Color labelColor, byte wear, string serialNumber)
114114
{
115-
MetalKeycard keycard = Create<MetalKeycard>(ItemType.KeycardCustomManagement);
115+
MetalKeycard keycard = Create<MetalKeycard>(ItemType.KeycardCustomMetalCase);
116116
keycard.KeycardLevels = keycardLevels;
117117
keycard.PermissionsColor = permissionsColor;
118118
keycard.ItemName = itemName;

EXILED/Exiled.API/Features/Items/Keycards/Site02Keycard.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public byte Wear
9999
/// <returns>The new <see cref="Site02Keycard"/>.</returns>
100100
public static Site02Keycard Create(KeycardLevels keycardLevels, Color permissionsColor, string itemName, Color color, string nameTag, string label, Color labelColor, byte wear)
101101
{
102-
Site02Keycard keycard = Create<Site02Keycard>(ItemType.KeycardCustomManagement);
102+
Site02Keycard keycard = Create<Site02Keycard>(ItemType.KeycardCustomSite02);
103103
keycard.KeycardLevels = keycardLevels;
104104
keycard.PermissionsColor = permissionsColor;
105105
keycard.ItemName = itemName;

EXILED/Exiled.API/Features/Items/Keycards/TaskForceKeycard.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public byte Rank
8787
/// <returns>The new <see cref="TaskForceKeycard"/>.</returns>
8888
public static TaskForceKeycard Create(KeycardLevels keycardLevels, Color permissionsColor, string itemName, Color color, string nameTag, string serialNumber, byte rank)
8989
{
90-
TaskForceKeycard keycard = Create<TaskForceKeycard>(ItemType.KeycardCustomManagement);
90+
TaskForceKeycard keycard = Create<TaskForceKeycard>(ItemType.KeycardCustomTaskForce);
9191
keycard.KeycardLevels = keycardLevels;
9292
keycard.PermissionsColor = permissionsColor;
9393
keycard.ItemName = itemName;

EXILED/Exiled.API/Features/Pickups/Keycards/CustomKeycardPickup.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ internal CustomKeycardPickup(KeycardPickup pickupBase)
4646
internal CustomKeycardPickup(ItemType type)
4747
: base(type)
4848
{
49+
if (!CustomKeycardItem.DataDict.ContainsKey(Serial))
50+
CustomKeycardItem.DataDict[Serial] = new KeycardData();
4951
}
5052

5153
/// <summary>

EXILED/Exiled.API/Features/Pickups/Keycards/ManagementKeycardPickup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public Color LabelColor
6060
}
6161

6262
/// <summary>
63-
/// Creates a <see cref="ManagementKeycardPickup"/>.
63+
/// Creates an UnSpawned <see cref="ManagementKeycardPickup"/>, to spawn the pickup, call <see cref="Pickup.Spawn(Vector3, Quaternion?, Player)"/> on the returned instance.
6464
/// </summary>
6565
/// <param name="keycardLevels">The permissions of the keycard.</param>
6666
/// <param name="permissionsColor">The color of the permissions of the keycard.</param>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -497,15 +497,15 @@ public static IEnumerable<T> Get<T>(IEnumerable<GameObject> gameObjects)
497497
_ => new GrenadePickup(type),
498498
},
499499
BaseFirearmPickup => new FirearmPickup(type),
500-
BaseKeycardPickup keycardPickup => type switch
500+
BaseKeycardPickup => type switch
501501
{
502502
ItemType.KeycardCustomTaskForce => new TaskForceKeycardPickup(type),
503503
ItemType.KeycardCustomSite02 => new Site02KeycardPickup(type),
504504
ItemType.KeycardCustomManagement => new ManagementKeycardPickup(type),
505505
ItemType.KeycardCustomMetalCase => new MetalKeycardPickup(type),
506506
ItemType.SurfaceAccessPass => new SingleUseKeycardPickup(type),
507507
ItemType.KeycardChaosInsurgency => new ChaosKeycardPickup(type),
508-
_ => new KeycardPickup(keycardPickup),
508+
_ => new KeycardPickup(type),
509509
},
510510
BaseBodyArmorPickup => new BodyArmorPickup(type),
511511
BaseScp330Pickup => new Scp330Pickup(),

0 commit comments

Comments
 (0)