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

feat: Fix OnInternalSpawning & Added ChargingJailbird setter (by BlackSerperior6) #368

Merged
merged 1 commit into from
Jan 10, 2025
Merged

feat: Fix OnInternalSpawning & Added ChargingJailbird setter (by BlackSerperior6) #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,7 @@ private void OnInternalChangingNickname(ChangingNicknameEventArgs ev)

private void OnInternalSpawning(SpawningEventArgs ev)
{
if (!IgnoreSpawnSystem && SpawnChance > 0 && !Check(ev.Player) && ev.Player.Role.Type == Role && Loader.Random.NextDouble() * 100 <= SpawnChance)
if (!IgnoreSpawnSystem && SpawnChance > 0 && !Check(ev.Player) && ev.NewRole == Role && Loader.Random.NextDouble() * 100 <= SpawnChance)
AddRole(ev.Player);
}

Expand Down
6 changes: 2 additions & 4 deletions EXILED/Exiled.Events/EventArgs/Item/ChargingJailbirdEventArgs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ public ChargingJailbirdEventArgs(ReferenceHub player, InventorySystem.Items.Item
{
Player = Player.Get(player);
Jailbird = (Jailbird)Item.Get(swingItem);
#pragma warning disable CS0618
IsAllowed = isAllowed;
#pragma warning restore CS0618
}

/// <summary>
Expand All @@ -47,8 +45,8 @@ public ChargingJailbirdEventArgs(ReferenceHub player, InventorySystem.Items.Item
public Item Item => Jailbird;

/// <summary>
/// Gets a value indicating whether the Jailbird can be charged.
/// Gets or sets a value indicating whether the Jailbird can be charged.
/// </summary>
public bool IsAllowed { get; }
public bool IsAllowed { get; set; }
}
}
7 changes: 6 additions & 1 deletion EXILED/Exiled.Events/Patches/Events/Item/JailbirdPatch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,12 @@ private static bool HandleJailbird(JailbirdItem instance, JailbirdMessageType me
ChargingJailbirdEventArgs ev = new(instance.Owner, instance);

Item.OnChargingJailbird(ev);
return true;
if (ev.IsAllowed)
return true;

ev.Player.RemoveHeldItem(destroy: false);
ev.Player.AddItem(ev.Item);
return false;
}

default:
Expand Down
Loading