From 14fc59540fe0bbac1143e2d662d8dbf168fe1733 Mon Sep 17 00:00:00 2001
From: JoshuaReason <s3544917@student.rmit.edu.au>
Date: Thu, 17 Oct 2019 15:38:27 +1100
Subject: [PATCH] Maybe fixed double move respawn

---
 Assets/{Scripts/Components.meta => Models.meta}       | 2 +-
 Assets/Plugins/IngameDebugConsole/Android.meta        | 8 ++++++++
 Assets/Plugins/IngameDebugConsole/Prefabs.meta        | 8 ++++++++
 Assets/Plugins/IngameDebugConsole/Scripts.meta        | 8 ++++++++
 Assets/Plugins/IngameDebugConsole/Sprites.meta        | 8 ++++++++
 Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta | 8 ++++++++
 Assets/Scripts/LevelBlocks/Air.cs                     | 3 ++-
 Assets/Scripts/LogicBlocks.meta                       | 8 ++++++++
 8 files changed, 51 insertions(+), 2 deletions(-)
 rename Assets/{Scripts/Components.meta => Models.meta} (77%)
 create mode 100644 Assets/Plugins/IngameDebugConsole/Android.meta
 create mode 100644 Assets/Plugins/IngameDebugConsole/Prefabs.meta
 create mode 100644 Assets/Plugins/IngameDebugConsole/Scripts.meta
 create mode 100644 Assets/Plugins/IngameDebugConsole/Sprites.meta
 create mode 100644 Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta
 create mode 100644 Assets/Scripts/LogicBlocks.meta

diff --git a/Assets/Scripts/Components.meta b/Assets/Models.meta
similarity index 77%
rename from Assets/Scripts/Components.meta
rename to Assets/Models.meta
index 5a95b09..5346456 100644
--- a/Assets/Scripts/Components.meta
+++ b/Assets/Models.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8d7394d70ec233849a60a26da5f23b75
+guid: 296bd90e667df1f4697823a0aa45acf0
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Plugins/IngameDebugConsole/Android.meta b/Assets/Plugins/IngameDebugConsole/Android.meta
new file mode 100644
index 0000000..12049b6
--- /dev/null
+++ b/Assets/Plugins/IngameDebugConsole/Android.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3d7d7a61a5341904eb3c65af025b1d86
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Plugins/IngameDebugConsole/Prefabs.meta b/Assets/Plugins/IngameDebugConsole/Prefabs.meta
new file mode 100644
index 0000000..6aa8bf2
--- /dev/null
+++ b/Assets/Plugins/IngameDebugConsole/Prefabs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7dbc36665bc0d684db9a4447e27a7a4b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Plugins/IngameDebugConsole/Scripts.meta b/Assets/Plugins/IngameDebugConsole/Scripts.meta
new file mode 100644
index 0000000..72dcaac
--- /dev/null
+++ b/Assets/Plugins/IngameDebugConsole/Scripts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 860c08388401a6d4e858fe4910ea9337
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Plugins/IngameDebugConsole/Sprites.meta b/Assets/Plugins/IngameDebugConsole/Sprites.meta
new file mode 100644
index 0000000..504a23d
--- /dev/null
+++ b/Assets/Plugins/IngameDebugConsole/Sprites.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cb5d7b23a9e684a41a6a5d4f300eb1e6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta b/Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta
new file mode 100644
index 0000000..f3769b1
--- /dev/null
+++ b/Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f6caae32d463529478f2186f47c2e3fe
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/LevelBlocks/Air.cs b/Assets/Scripts/LevelBlocks/Air.cs
index 7ccc472..79e2a0d 100644
--- a/Assets/Scripts/LevelBlocks/Air.cs
+++ b/Assets/Scripts/LevelBlocks/Air.cs
@@ -24,15 +24,16 @@ public class Air : ActiveBlock
         Debug.Log("Set player scale to one");
         player.transform.localScale = Vector3.one;
 
-        isFinished = true;
     }
 
     public override IEnumerator OnRoundEnd(PlayerData[] allPlayers)
     {
         isFinished = true;
+
         DeleteCount--;
         if (DeleteCount == 0)
             Destroy(gameObject);
+
         yield break;
     }
 
diff --git a/Assets/Scripts/LogicBlocks.meta b/Assets/Scripts/LogicBlocks.meta
new file mode 100644
index 0000000..98af9d1
--- /dev/null
+++ b/Assets/Scripts/LogicBlocks.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8936b441d7647f74884c94f97bfb8931
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: