From e67665ca3fc97c6bce7c5d447916324b686ee89a Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Wed, 23 Sep 2020 20:07:07 -0700
Subject: [PATCH] Made player-to-player attacks more consistent

The direction that someone is pushed is based purely on the direction
the attacker is facing.
---
 src/game/interaction.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/game/interaction.c b/src/game/interaction.c
index 56a72a4d5..3776abe32 100644
--- a/src/game/interaction.c
+++ b/src/game/interaction.c
@@ -646,9 +646,10 @@ u32 determine_knockback_action(struct MarioState *m, UNUSED s32 arg) {
         f32 mag = scaler * (f32)gServerSettings.playerKnockbackStrength * sign;
         m->forwardVel = mag;
         if (sign > 0 && terrainIndex == 1) { mag *= -1.0f; }
-        m->vel[0] = mag * sins(angleToObject);
+        m->vel[0] = -mag * sins(m->interactObj->oFaceAngleYaw);
         m->vel[1] = (mag < 0) ? -mag : mag;
-        m->vel[2] = mag * coss(angleToObject);
+        m->vel[2] = -mag * coss(m->interactObj->oFaceAngleYaw);
+        m->faceAngle[1] = m->interactObj->oFaceAngleYaw + (sign == 1.0f ? 0 : 0x8000);
     }
 
     return bonkAction;