Mathew/Emberwild
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feat/inport-props' into feat/craft-discovery

Browse Source 
# Conflicts:
#	Assets/External/Animated PBR Chest Demo/Materials/WoodChest.mat
#	Packages/com.distantlands.cozy.core/Content/Integration/Import for BiRP.unitypackage.meta
#	Packages/com.distantlands.cozy.core/Content/Integration/Import for HDRP.unitypackage.meta
#	Packages/com.distantlands.cozy.core/Content/Integration/Import for URP.unitypackage.meta
This commit is contained in:
Mathew
2026-07-25 19:42:26 +02:00
parent 0052b0d98e f47baf957e
commit 78bfdf2828
954 changed files with 999772 additions and 26193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/GAME/Script/Network/Pickable.cs
+20
View File
@@ -61,6 +61,15 @@ namespace Ashwild.Network
/// Asks the registry (server) to claim this pickup for the local player. Aborts while the player
/// is building (the hammer's placement/demolition would otherwise let an interact press snatch an
/// item mid-build), if already claimed, or if the local inventory is full.
///
/// A full inventory is announced rather than ignored: silently doing nothing on a press is
/// indistinguishable from a broken pickup, and that ambiguity is what hid the real bugs. A scene
/// pickup the registry never accepted (missing or duplicate baked id) is refused here too, with
/// the reason spelled out — the server would drop the request anyway.
///
/// The grab animation fires here, once every refusal is behind us but before the server has
/// answered: the hand must reach out on the press, not a round-trip later. A refused pickup
/// therefore never animates, and a granted one animates immediately.
/// </summary>
public void Pickup()
{
@@ -78,10 +87,21 @@ namespace Ashwild.Network
}
if (PickableRegistry.Instance.IsClaimed(Id)) return;
if (Id >= 0 && !PickableRegistry.Instance.IsRegistered(Id))
{
Debug.LogError($"[Pickable] '{name}' (id {Id}) is not tracked by the registry — the server " +
"would drop this pickup. Check the console for an id error at startup.", this);
return;
}
// Client-side pre-check so we don't claim something we can't hold.
if (PlayerInventory.Instance != null && !PlayerInventory.Instance.CanFit(itemData, quantity))
{
PlayerEvents.RaiseInteractionRefused("Inventory full");
return;
}
PlayerEvents.RaiseGrabPerformed();
PickableRegistry.Instance.RequestPickupServerRpc(Id);
}