Revert breaking changes and files that should be ignored

AddstarMC · Mar 3, 2018 · af72f0d · af72f0d
1 parent ed36764
commit af72f0d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 37 deletions.
diff --git a/.classpath b/.classpath
diff --git a/.project b/.project
diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java
@@ -76,7 +76,7 @@ public void onEntityDamageByEntityEvent(EntityDamageByEntityEvent event) {
 						} 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
@@ -15,17 +15,12 @@
 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 void onPlayerQuitEvent(PlayerQuitEvent event) {
 	@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());
 	}
 }