Skip to content

Do not allow the player to hit themselves #17

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

Merged
LokiusV merged 1 commit into from
Feb 3, 2026
Merged

Do not allow the player to hit themselves #17

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
28 changes: 14 additions & 14 deletions DFUVR/WeaponCollision.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using HarmonyLib;
using DaggerfallWorkshop.Game.Items;
using DaggerfallWorkshop.Game.Questing;

namespace DFUVR
{
public class WeaponCollision : MonoBehaviour
Expand All @@ -31,9 +32,8 @@ void Start()

private void OnTriggerEnter(Collider other)
{


//Plugin.LoggerInstance.LogInfo("Hit something");
bool hitSomething = false;

if (other.GetComponent<DaggerfallEntityBehaviour>())
{
Expand All @@ -55,41 +55,41 @@ private void OnTriggerEnter(Collider other)
hitDirection = hitDirection.normalized;
//Debug.Log("Hit Direction: " + hitDirection);

weaponManager.WeaponDamage(currentRightHandWeapon, false, false, hitTransform, hitTransform.localPosition, hitDirection);

var playerId = GameManager.Instance.PlayerObject.GetInstanceID();
if (playerId != other.gameObject.GetInstanceID())
{
weaponManager.WeaponDamage(currentRightHandWeapon, false, false, hitTransform, hitTransform.localPosition, hitDirection);
hitSomething = true;
}
}
else if (other.GetComponent<DaggerfallAction>())
{
Plugin.LoggerInstance.LogInfo("Hit action");
DaggerfallAction action= other.GetComponent<DaggerfallAction>();
DaggerfallAction action = other.GetComponent<DaggerfallAction>();
if (Var.weaponManager != null)
{
GameObject player = (GameObject)AccessTools.Field(typeof(WeaponManager), "player").GetValue(Var.weaponManager);
action.Receive(player, DaggerfallAction.TriggerTypes.Attack);
hitSomething = true;
}
else
{
Plugin.LoggerInstance.LogError("null");
}

}
else if (other.GetComponent<DaggerfallActionDoor>())
else if (other.GetComponent<DaggerfallActionDoor>())
{
//Plugin.LoggerInstance.LogInfo("Hit door");
DaggerfallActionDoor actionDoor = other.GetComponent<DaggerfallActionDoor>();
if (actionDoor)
{
actionDoor.AttemptBash(true);
hitSomething = true;
}


}

Haptics.TriggerHapticFeedback(UnityEngine.XR.XRNode.RightHand, 0.6f);
//else if()

if (hitSomething)
Haptics.TriggerHapticFeedback(UnityEngine.XR.XRNode.RightHand, 0.6f);
}


}
}