From ee63b94f2c9e176f549c4446391e4c59f5a5be53 Mon Sep 17 00:00:00 2001
From: SmallJoker <SmallJoker@users.noreply.github.com>
Date: Sun, 5 Aug 2018 22:28:41 +0200
Subject: Prevent objects from colliding with own child attachments (#7610)

Also, use a better distance calculation for 'collide with objects'.
Fixes the issue of a vehicle occasionally colliding with its own driver,
causing one of the velocity components to be set to zero.
---
 src/serverobject.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/serverobject.h')

diff --git a/src/serverobject.h b/src/serverobject.h
index ba205f6a5..04d52425d 100644
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -173,6 +173,7 @@ public:
 	{}
 	virtual const std::unordered_set<int> &getAttachmentChildIds()
 	{ static const std::unordered_set<int> rv; return rv; }
+	virtual ServerActiveObject *getParent() const { return nullptr; }
 	virtual ObjectProperties* accessObjectProperties()
 	{ return NULL; }
 	virtual void notifyObjectPropertiesModified()
-- 
cgit v1.2.3