From dd26664ac443aad88d02d89ef58155c12fd88776 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Mon, 28 Mar 2022 20:20:29 -0700
Subject: [PATCH] NSEntity: fix typo in ParentUpdate() preventing us from
 parenting things by offset

---
 src/gs-entbase/shared/NSEntity.qc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gs-entbase/shared/NSEntity.qc b/src/gs-entbase/shared/NSEntity.qc
index b1275de2..edadeb68 100644
--- a/src/gs-entbase/shared/NSEntity.qc
+++ b/src/gs-entbase/shared/NSEntity.qc
@@ -271,8 +271,8 @@ NSEntity::ParentUpdate(void)
 		if (p) {
 			if (!m_parent_attachment) {
 				parent = (NSEntity)p;
-				vector ofs = parent.GetSpawnOrigin() - GetSpawnOrigin();
-				SetOrigin(p.origin + ofs);
+				vector ofs = parent.origin - parent.GetSpawnOrigin();
+				SetOrigin(GetSpawnOrigin() + ofs);
 			} else if (m_parent_attachment == "origin") {
 				SetOrigin(p.origin);
 			}