JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix war invasion

Browse Source
This commit is contained in:
Shaun Bennett 2015-10-29 13:14:27 -04:00
parent fd1638a572
commit 364d8b05af
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarManager.java
View File

@ -232,7 +232,7 @@ public class WarManager extends MiniPlugin
while (invasionIterator.hasNext()) while (invasionIterator.hasNext())
{ {
WarInvasion invasion = invasionIterator.next(); WarInvasion invasion = invasionIterator.next();
if (invasion.getEndTime() > currentTime) if (currentTime >= invasion.getEndTime())
{ {
WarInvasionEndEvent endEvent = new WarInvasionEndEvent(invasion); WarInvasionEndEvent endEvent = new WarInvasionEndEvent(invasion);
Bukkit.getServer().getPluginManager().callEvent(endEvent); Bukkit.getServer().getPluginManager().callEvent(endEvent);
@ -249,7 +249,7 @@ public class WarManager extends MiniPlugin
@EventHandler @EventHandler
public void onInvasionStart(WarInvasionStartEvent event) 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 @EventHandler