From af72f0d829671e25addb40fcfa85da68fcf51760 Mon Sep 17 00:00:00 2001
From: Narimm <benjicharlton@gmail.com>
Date: Sat, 3 Mar 2018 12:46:00 +1000
Subject: [PATCH] Revert breaking changes and files that should be ignored

---
 .classpath                                      |  9 ---------
 .project                                        | 17 -----------------
 .../Listeners/OnEntityDamageByEntityEvent.java  |  2 +-
 .../BlockHunt/Listeners/OnPlayerQuitEvent.java  | 12 ++----------
 4 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100644 .classpath
 delete mode 100644 .project

diff --git a/.classpath b/.classpath
deleted file mode 100644
index d860ebd..0000000
--- a/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="lib/LibsDisguises.jar"/>
-	<classpathentry kind="lib" path="lib/ProtocolLib.jar"/>
-	<classpathentry kind="lib" path="lib/spigot-1.9.2-R0.1-SNAPSHOT.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/.project b/.project
deleted file mode 100644
index b516b86..0000000
--- a/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>BlockHunt</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java
index c2514c4..0a34454 100644
--- a/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java
+++ b/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java
@@ -76,7 +76,7 @@ public class OnEntityDamageByEntityEvent implements Listener {
 						} else {
 							// Seeker damaged by hider
 							if (!arena.hidersCanHurtSeekers) {
-								event.setCancelled(false);
+								event.setCancelled(true);
 								return;
 							}
 						}
diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnPlayerQuitEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnPlayerQuitEvent.java
index 45b9a16..4dbf75a 100644
--- a/src/nl/Steffion/BlockHunt/Listeners/OnPlayerQuitEvent.java
+++ b/src/nl/Steffion/BlockHunt/Listeners/OnPlayerQuitEvent.java
@@ -15,17 +15,12 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
 public class OnPlayerQuitEvent implements Listener {
-	
-	public ArrayList<String> leftPlayer = new ArrayList<String>();
-	public LocationSerializable spawnWarp;
-	
+
 	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onPlayerQuitEvent(PlayerQuitEvent event) {
 		Player playerLeaving = event.getPlayer();
 		for (Arena arena : W.arenaList) {
 			if (arena.playersInArena.contains(playerLeaving)) {
-				spawnWarp = arena.spawnWarp;
-				leftPlayer.add(playerLeaving.getUniqueId().toString());
 				ArenaHandler.playerLeaveArena(playerLeaving, true, true);
 			}
 		}
@@ -34,9 +29,6 @@ public class OnPlayerQuitEvent implements Listener {
 	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onPlayerJoinEvent(PlayerJoinEvent event) {
 		Player playerJoining = event.getPlayer();
-		if(leftPlayer.contains(playerJoining.getUniqueId().toString())) {
-			playerJoining.teleport(spawnWarp);
-			leftPlayer.remove(playerJoining.getUniqueId().toString());
-		}
+		playerJoining.teleport(playerJoining.getWorld().getSpawnLocation());
 	}
 }