From 1f8bb46d8483b3b67b9fbfdc4f68edcf208e1596 Mon Sep 17 00:00:00 2001
From: Ad5001 <mail@ad5001.eu>
Date: Tue, 31 Oct 2017 17:35:09 +0100
Subject: [PATCH] Updating for github release, removing useless code.

---
 src/Ad5001/Spooky/Main.php           |  2 +-
 src/Ad5001/Spooky/entity/Ghost.php   | 19 -------------------
 src/Ad5001/Spooky/tasks/TickTask.php | 20 --------------------
 3 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/src/Ad5001/Spooky/Main.php b/src/Ad5001/Spooky/Main.php
index f6709f8..088077f 100644
--- a/src/Ad5001/Spooky/Main.php
+++ b/src/Ad5001/Spooky/Main.php
@@ -48,7 +48,7 @@ class Main extends PluginBase implements Listener{
         if(!file_exists($this->getDataFolder() . "Spooky.mcpack")) {
             $downRP = true;
             echo TextFormat::toANSI("§f[Spooky] ⚪ Downloading resource pack...");
-            file_put_contents($this->getDataFolder() . "Spooky.mcpack", Utils::getURL("https://download.ad5001.eu/other/Spooky/Spooky.mcpack"));
+            file_put_contents($this->getDataFolder() . "Spooky.mcpack", Utils::getURL("https://github.com/Ad5001/Spooky/releases/download/1.0/Spooky.mcpack"));
         }
         echo str_repeat("\010", $downRP ? strlen(TextFormat::toANSI("§f[Spooky] ⚪ Downloading resource pack...")) : 0) . TextFormat::toANSI("§f[Spooky] ⚪ Applying resource pack...   "); // Replacing latest message
         $pack = new ZippedResourcePack($this->getDataFolder() . "Spooky.mcpack");
diff --git a/src/Ad5001/Spooky/entity/Ghost.php b/src/Ad5001/Spooky/entity/Ghost.php
index acdd01f..08d2488 100644
--- a/src/Ad5001/Spooky/entity/Ghost.php
+++ b/src/Ad5001/Spooky/entity/Ghost.php
@@ -104,25 +104,6 @@ class Ghost extends Human {
 		$p->sendPopup("Music: The Return by Niviro, www.djniviro.com");
 	}
 	
-	/**
-	 * Starts a sequence where the ghost is in an intense fight.
-	 *
-	 * @return void
-	 */
-	public function intenseFight(){
-		if(!$this->checkIfConnected()) return;
-		// TODO: Custom intense fight
-	}
-
-	/**
-	 * Starts a sequence where the ghost is in an calm fight.
-	 *
-	 * @return void
-	 */
-	public function calmFight(){
-		if(!$this->checkIfConnected()) return;
-	}
-	
 	/**
 	 * Starts a sequence where the ghost blinds the player,
 	 * slows him down (zooming effect w/ fov) and he appears invuulnerable 
diff --git a/src/Ad5001/Spooky/tasks/TickTask.php b/src/Ad5001/Spooky/tasks/TickTask.php
index 7530b44..6d0ec51 100644
--- a/src/Ad5001/Spooky/tasks/TickTask.php
+++ b/src/Ad5001/Spooky/tasks/TickTask.php
@@ -43,15 +43,11 @@ class TickTask extends PluginTask {
                 self::$ghosts[$i]->spawnTo(self::$ghosts[$i]->getPlayer());
                 self::$ghosts[$i]->scareEnterPhase();
                 break;
-                case 66: // 1m06s
-                self::$ghosts[$i]->intenseFight();
-                break;
                 case 82: // 1m22s
                 self::$ghosts[$i]->movePlayerRandomly();
                 self::$ghosts[$i]->repeatFunc = "move";
                 break;
                 case 88: // 1m28s
-                self::$ghosts[$i]->calmFight();
                 self::$ghosts[$i]->repeatFunc = null;
                 break;
                 case 95: // 1m35s
@@ -62,18 +58,9 @@ class TickTask extends PluginTask {
                 self::$ghosts[$i]->repeatFunc = null;
                 self::$ghosts[$i]->scareEnterPhase();
                 break;
-                case 103: // 1m43s
-                self::$ghosts[$i]->intenseFight();
-                break;
-                case 136: // 2m16s
-                self::$ghosts[$i]->calmFight();
-                break;
                 case 151: // 2m31s
                 self::$ghosts[$i]->scareEnterPhase();
                 break;
-                case 153: // 2m33s
-                self::$ghosts[$i]->intenseFight();
-                break;
                 case 168: // 2m48s
                 self::$ghosts[$i]->movePlayerRandomly();
                 self::$ghosts[$i]->repeatFunc = "move";
@@ -84,17 +71,10 @@ class TickTask extends PluginTask {
                 break;
                 case 183: // 3m03s
                 self::$ghosts[$i]->repeatFunc = null;
-                self::$ghosts[$i]->intenseFight();
                 break;
                 case 197: // 3m17s
                 self::$ghosts[$i]->scareEnterPhase();
                 break;
-                case 198: // 3m18s
-                self::$ghosts[$i]->intenseFight();
-                break;
-                case 227: // 3m47s
-                self::$ghosts[$i]->calmFight();
-                break;
                 case 262: // 4m22
                 self::$ghosts[$i]->getPlayer()->sendMessage("Mwahahahaha... Try being faster next time!");
                 self::$ghosts[$i]->close();