From a59a33c0393c1410832f6d844361445702e5b987 Mon Sep 17 00:00:00 2001
From: Joshua Reason <s3544917@student.rmit.edu.au>
Date: Thu, 17 Oct 2019 22:21:46 +1100
Subject: [PATCH] did some bug fixes

---
 Assets/Data/Inventory/BaseInventory.asset      | 2 +-
 Assets/Data/Logic Blocks/Missile.asset         | 4 ++--
 Assets/Plugins/IngameDebugConsole/Sprites.meta | 8 --------
 Assets/Scripts/Logic/Blocks/Jump.cs            | 2 +-
 Assets/Scripts/Projectiles/HomingMissile.cs    | 3 ++-
 Assets/Scripts/Projectiles/Hookshot.cs         | 2 +-
 ProjectSettings/EditorBuildSettings.asset      | 2 +-
 7 files changed, 8 insertions(+), 15 deletions(-)
 delete mode 100644 Assets/Plugins/IngameDebugConsole/Sprites.meta

diff --git a/Assets/Data/Inventory/BaseInventory.asset b/Assets/Data/Inventory/BaseInventory.asset
index 34ff737..5bc7a7c 100644
--- a/Assets/Data/Inventory/BaseInventory.asset
+++ b/Assets/Data/Inventory/BaseInventory.asset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:78ae471f15115791ca45bbfb08426eee099b2279851a3178a457837c0032e2ec
+oid sha256:c81ff8a2a9d20a7dbf315a47e3f940b787afa602a751c355d85b064e6b90a9fd
 size 1313
diff --git a/Assets/Data/Logic Blocks/Missile.asset b/Assets/Data/Logic Blocks/Missile.asset
index 6b5648a..5fe7ad5 100644
--- a/Assets/Data/Logic Blocks/Missile.asset	
+++ b/Assets/Data/Logic Blocks/Missile.asset	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dee86c4c1ae6c1d17728507226c604655958d6ddbc22576fe9125f081716b168
-size 571
+oid sha256:45faf754a522a335f2292b5e89d19084c7f144fc1882aec0496144deff06bccc
+size 670
diff --git a/Assets/Plugins/IngameDebugConsole/Sprites.meta b/Assets/Plugins/IngameDebugConsole/Sprites.meta
deleted file mode 100644
index 504a23d..0000000
--- a/Assets/Plugins/IngameDebugConsole/Sprites.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: cb5d7b23a9e684a41a6a5d4f300eb1e6
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Logic/Blocks/Jump.cs b/Assets/Scripts/Logic/Blocks/Jump.cs
index 5f4425e..7f1ad91 100644
--- a/Assets/Scripts/Logic/Blocks/Jump.cs
+++ b/Assets/Scripts/Logic/Blocks/Jump.cs
@@ -35,7 +35,7 @@ public class Jump : LogicBlock
         player.justMoved = true;
         Block endBlock = GetEndBlock(player.CurrentBlock, player.transform, ~player.Ignore);
 
-        while(endBlock.CurrentPlayer != null)
+        while(endBlock.CurrentPlayer != null && endBlock.CurrentPlayer != player)
         {
             yield return player.StartCoroutine(player.AnimateToPosition(endBlock.VisualPosition + Vector3.up * 0.5f, Character.Animation.Jump, 0.8f));
             endBlock.CurrentPlayer.StartAnimation(Character.Animation.Hit);
diff --git a/Assets/Scripts/Projectiles/HomingMissile.cs b/Assets/Scripts/Projectiles/HomingMissile.cs
index 1ab659d..1ad71f8 100644
--- a/Assets/Scripts/Projectiles/HomingMissile.cs
+++ b/Assets/Scripts/Projectiles/HomingMissile.cs
@@ -32,9 +32,10 @@ public class HomingMissile : Projectile
 
         for (int i = 0; i < 4; i++)
         {
-            if (Block.isBlockAtPosition( player.transform.position + possibleDirections[i].ToVector() + Vector3.up, 1, ~0))
+            if (Block.isBlockAtPosition(player.CurrentBlock.position + possibleDirections[i].ToVector() + Vector3.up, 1, ~0))
                 continue;
 
+            Debug.Log("Pushing player " + possibleDirections[i]);
             yield return StartCoroutine(player.CurrentBlock.DoPush(player, possibleDirections[i].ToVector()));
             break;
         }
diff --git a/Assets/Scripts/Projectiles/Hookshot.cs b/Assets/Scripts/Projectiles/Hookshot.cs
index 9eed5ea..507c75a 100644
--- a/Assets/Scripts/Projectiles/Hookshot.cs
+++ b/Assets/Scripts/Projectiles/Hookshot.cs
@@ -22,7 +22,7 @@ public class Hookshot : Projectile
         if (hitBlock == player.CurrentBlock)
         {
             //fire something out then back in here
-            StartCoroutine(lerpShot(hookObject, hookObject.position, hookObject.position + direction*10, 1.0f));
+            yield return StartCoroutine(lerpShot(hookObject, hookObject.position, hookObject.position + direction*10, 1.0f));
             yield break;
         }
             
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index fec7366..af5910d 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7be799905646e6d7aaab37702ab8e14db03f14e8814c42bb9471fdcb8028125e
+oid sha256:81dc2bb76c1a5b7639713c40b44bce40b5757f89e1fe33e7033950ea47e88071
 size 1282