RochesterX/Crash-Course
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

bug fixes

Browse Source
This commit is contained in:
djkellerman
2025-03-28 23:07:33 -04:00
parent c7b1e55a3e
commit af8ea44fe1
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/Scripts/Player/Damageable.cs
View File

@@ -40,14 +40,14 @@ public class Damageable : MonoBehaviour
private void Damage(GameObject damageSource) // Damages player
{
if (dying) return;
if (dying || damageSource.CompareTag("Hat")) return; // Exclude hat from taking damage
float actualForce = damageSource.GetComponent<Damageable>().force;
Block blockComponent = GetComponent<Block>();
GetComponentInChildren<UseItem>().DropItem(); // Drops hat if held
if (blockComponent != null && blockComponent.blocking)
if (blockComponent != null && blockComponent.blocking)
{
if (blockComponent.IsParrying()) // Player receives damage if punching a parrying player
{
@@ -106,7 +106,6 @@ public class Damageable : MonoBehaviour
}
}
public void HandleDeath() // Removes player from dying state after respawn
{
GameManager.Instance.PlayerDied(this);