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

Ensure that Tic-Tac-Toe invites are cleared when the gadget is disabled

Browse Source
This commit is contained in:
Sam 2017-10-31 12:10:01 +00:00 committed by Alexander Meech
parent d2416d1122
commit 27e9af8659
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemOAndX.java
View File

@ -17,11 +17,9 @@ import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.scheduler.BukkitRunnable;
import mineplex.core.arcadeevents.CoreGameStartEvent;
import mineplex.core.common.Pair;
import mineplex.core.common.jsonchat.ClickEvent;
import mineplex.core.common.jsonchat.HoverEvent;
@ -304,11 +302,16 @@ public class ItemOAndX extends ItemGadget
}
}
@EventHandler
public void playerQuit(PlayerQuitEvent event)
@Override
public void disableCustom(Player player, boolean message)
{
Player player = event.getPlayer();
super.disableCustom(player, message);
remove(player);
}
private void remove(Player player)
{
_gameBoards.removeIf(board ->
{
if (board.PlayerA.equals(player) || board.PlayerB.equals(player))
@ -319,13 +322,8 @@ public class ItemOAndX extends ItemGadget
return false;
});
}
@EventHandler
public void gameStart(CoreGameStartEvent event)
{
_gameBoards.forEach(board -> cleanupBoard(board, false));
_gameBoards.clear();
_invites.remove(player.getName());
}
@EventHandler