From bf1241a54bc8d6c5c7c2d026ea0789fe9043459b Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Thu, 27 Oct 2011 17:02:18 +0300 Subject: [PATCH] Change some things in the attachment system --- qcsrc/server/mutators/sandbox.qc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc index 077952db57..ff98edbf26 100644 --- a/qcsrc/server/mutators/sandbox.qc +++ b/qcsrc/server/mutators/sandbox.qc @@ -82,7 +82,6 @@ void sandbox_AttachObject_Set(entity e, entity parent, string s) e.solid = SOLID_NOT; e.takedamage = DAMAGE_NO; - setorigin(e, parent.origin); setattachment(e, parent, s); e.owner = parent; } @@ -101,8 +100,11 @@ void sandbox_AttachObject_Remove(entity e) head.takedamage = DAMAGE_AIM; setattachment(head, world, ""); - setorigin(head, e.origin); // prevents a bug head.owner = world; + + // objects reset origin and angles when detached, so apply the parent's to prevent teleporting + setorigin(head, e.origin); + head.angles = e.angles; } } } -- 2.39.2