RunicGateway/runicnpc-rust
3
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fix(kit): find a kit's extra by its item definition when it has no held entity (#20)

Browse Source 
Rust's November 2026 build (staging 26344826) adds the server variable
ItemModEntity.playerOnlyEntityBeltOnly, on by default: an item Rust marks
player-only, the medical syringe among them, has a held entity only while it
is in the belt. A kit puts its syringes in the main inventory, so the heal
(D260) found no item whose held entity is a MedicalTool and never healed
(s5.kit.heal on the staging drill: heals 0, health 75).

FindHeld now asks the item definition's entity prefab when an item has no
held entity, for every extra (heal, melee, flamethrower, grenade, rocket),
and HasFuel reads the flamethrower's fuel type the same way. Holding the item
moves it to the belt, where Rust makes its entity. A heal that cannot hold the
item (a full belt) is now no heal, not a heal of an item never held (D331).

On rust-staging: s5.kit.heal PASS, heals 2, syringes left 0, health 145.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01E14m6SuuY6i1vASFeGDBeY
This commit is contained in:
claude
2026-11-02 04:24:14 -06:00
parent a43e5c299f
commit 5c3a360b70
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
plugin/RunicNPC.cs
View File

@@ -2784,13 +2784,29 @@ namespace Oxide.Plugins
if (container == null)
continue;
foreach (Item item in container.itemList)
if (item != null && item.GetHeldEntity() is T)
if (item != null && HeldAs<T>(item) != null)
return item;
}
return null;
}
/// <summary>
/// The item's held entity as a <typeparamref name="T"/>, or, when it has none, its definition's
/// entity prefab's. Since Rust's November 2026 build a "player-only" item (a syringe) has a held
/// entity only in the belt (<c>ItemModEntity.playerOnlyEntityBeltOnly</c>), and an extra waits in
/// the main inventory until <see cref="Hold"/> moves it (issue #20).
/// </summary>
private static T HeldAs<T>(Item item) where T : HeldEntity
{
BaseEntity held = item.GetHeldEntity();
if (held != null)
return held as T;
ItemModEntity mod = item.info.GetComponent<ItemModEntity>();
GameObject prefab = mod != null && mod.entityPrefab != null && mod.entityPrefab.isValid ? mod.entityPrefab.Get() : null;
return prefab != null ? prefab.GetComponent<T>() : null;
}
/// <summary>Puts an item in its hands; only the belt can be held, so it is moved there first.</summary>
private static bool Hold(RunicNpcPlayer npc, Item item)
{
@@ -2914,7 +2930,8 @@ namespace Oxide.Plugins
if (amount <= 0f)
return false;
Hold(npc, item);
if (!Hold(npc, item))
return false; // a full belt: nowhere to hold it.
npc.SignalBroadcast(BaseEntity.Signal.Attack);
item.UseItem(1);
npc.Heal(amount);
@@ -3011,8 +3028,10 @@ namespace Oxide.Plugins
private static bool HasFuel(RunicNpcPlayer npc, Item flameItem)
{
FlameThrower f = flameItem.GetHeldEntity() as FlameThrower;
return f != null && (f.ammo > 0 || (f.fuelType != null && npc.inventory.FindItemByItemName(f.fuelType.shortname) != null));
// Off the belt it may have no held entity, so no tank (HeldAs): only the kit's fuel counts then.
FlameThrower held = flameItem.GetHeldEntity() as FlameThrower;
FlameThrower f = HeldAs<FlameThrower>(flameItem);
return f != null && ((held != null && held.ammo > 0) || (f.fuelType != null && npc.inventory.FindItemByItemName(f.fuelType.shortname) != null));
}
/// <summary>