From bf8a410fa2a933656b68d5df749010c18c5182ee Mon Sep 17 00:00:00 2001
From: Diren D Bharwani <diren.bharwani@gmail.com>
Date: Sun, 11 Dec 2022 20:33:30 +0800
Subject: [PATCH] Fixed bug where colliders were not properly deserialised

---
 .../Collision/CollisionShapes/SHCollisionShapeFactory.cpp      | 3 +--
 SHADE_Engine/src/Serialization/SHYAMLConverters.h              | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/SHADE_Engine/src/Physics/Collision/CollisionShapes/SHCollisionShapeFactory.cpp b/SHADE_Engine/src/Physics/Collision/CollisionShapes/SHCollisionShapeFactory.cpp
index 293d5c2a..d6ef5f0d 100644
--- a/SHADE_Engine/src/Physics/Collision/CollisionShapes/SHCollisionShapeFactory.cpp
+++ b/SHADE_Engine/src/Physics/Collision/CollisionShapes/SHCollisionShapeFactory.cpp
@@ -59,12 +59,11 @@ namespace SHADE
       case SHCollisionShape::Type::SPHERE:
       {
         SHSphereCollisionShape* sphere = spheres.find(shape->id)->second;
+        spheres.erase(shape->id);
 
         delete sphere;
         sphere = nullptr;
 
-        spheres.erase(shape->id);
-
         break;
       }
       case SHCollisionShape::Type::CAPSULE:
diff --git a/SHADE_Engine/src/Serialization/SHYAMLConverters.h b/SHADE_Engine/src/Serialization/SHYAMLConverters.h
index cbbe8505..73b22fd6 100644
--- a/SHADE_Engine/src/Serialization/SHYAMLConverters.h
+++ b/SHADE_Engine/src/Serialization/SHYAMLConverters.h
@@ -237,8 +237,8 @@ namespace YAML
 
           switch (colliderType)
           {
-          case SHCollisionShape::Type::BOX: break;
           case SHCollisionShape::Type::SPHERE: collider->AddSphereCollisionShape(1.0f); break;
+          case SHCollisionShape::Type::BOX: break;
           case SHCollisionShape::Type::CAPSULE: break;
           default:;
           }