From 364d8b05afc43c4ee9dff838aad31205fd913300 Mon Sep 17 00:00:00 2001
From: Shaun Bennett <shaun@mineplex.com>
Date: Thu, 29 Oct 2015 13:14:27 -0400
Subject: [PATCH] Fix war invasion

---
 .../src/mineplex/game/clans/clans/war/WarManager.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarManager.java
index 495b5b2f7..00506a0ab 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarManager.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarManager.java
@@ -232,7 +232,7 @@ public class WarManager extends MiniPlugin
 			while (invasionIterator.hasNext())
 			{
 				WarInvasion invasion = invasionIterator.next();
-				if (invasion.getEndTime() > currentTime)
+				if (currentTime >= invasion.getEndTime())
 				{
 					WarInvasionEndEvent endEvent = new WarInvasionEndEvent(invasion);
 					Bukkit.getServer().getPluginManager().callEvent(endEvent);
@@ -249,7 +249,7 @@ public class WarManager extends MiniPlugin
 	@EventHandler
 	public void onInvasionStart(WarInvasionStartEvent event)
 	{
-		Bukkit.broadcastMessage(F.main("War", F.elem(event.getWarInvasion().getInvaderClan()) + " can now invade " + F.elem(event.getWarInvasion().getInvaderClan())));
+		Bukkit.broadcastMessage(F.main("War", F.elem(event.getWarInvasion().getInvaderClan()) + " can now invade " + F.elem(event.getWarInvasion().getInvadedClan())));
 	}
 
 	@EventHandler