From 75b7348cd6778a7c477d1c373128e5ff1532d602 Mon Sep 17 00:00:00 2001
From: Duion <duionium@gmail.com>
Date: Fri, 23 Dec 2016 16:24:29 +0100
Subject: [PATCH] fix for join server with bots crash

---
 Engine/source/T3D/shapeImage.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Engine/source/T3D/shapeImage.cpp b/Engine/source/T3D/shapeImage.cpp
index 540a9ad75..d6d89aba1 100644
--- a/Engine/source/T3D/shapeImage.cpp
+++ b/Engine/source/T3D/shapeImage.cpp
@@ -3377,10 +3377,10 @@ void ShapeBase::shakeCamera( U32 imageSlot )
    // first check if explosion is near camera
    GameConnection* connection = GameConnection::getConnectionToServer();
    ShapeBase *obj = dynamic_cast<ShapeBase*>(connection->getControlObject());
-
+   
    bool applyShake = true;
 
-   if (obj)
+   if (obj && !mIsAiControlled)
    {
       ShapeBase* cObj = obj;
       while ((cObj = cObj->getControlObject()) != 0)
@@ -3393,7 +3393,7 @@ void ShapeBase::shakeCamera( U32 imageSlot )
       }
    }
 
-   if (applyShake && obj)
+   if (applyShake && obj && !mIsAiControlled)
    {
       VectorF diff;
       getMuzzlePoint(imageSlot, &diff);