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

Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

Browse Source
This commit is contained in:
Jonathan Williams 2014-11-15 03:42:57 -08:00
commit ad6f41e1c6
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
View File

@ -285,11 +285,14 @@ public class GameFlagManager implements Listener
if (!game.InProgress()) if (!game.InProgress())
return; return;
if (game.InventoryClick)
return;
Player player = UtilPlayer.searchExact(event.getWhoClicked().getName()); Player player = UtilPlayer.searchExact(event.getWhoClicked().getName());
if (player != null && !game.IsAlive(player)) if (player != null && !game.IsAlive(player))
return; return;
if (game.InventoryClick) if (!game.IsAlive(player))
return; return;
if (event.getInventory().getType() == InventoryType.CRAFTING) if (event.getInventory().getType() == InventoryType.CRAFTING)

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
View File

@ -156,12 +156,12 @@ public class GamePlayerManager implements Listener
} }
@EventHandler @EventHandler
public void InventoryClick(InventoryClickEvent event) public void DisallowCreativeClick(InventoryClickEvent event)
{ {
if (Manager.GetGame() == null || !Manager.GetGame().InProgress()) if (Manager.GetGame() == null || !Manager.GetGame().InProgress())
return; return;
if (event.getWhoClicked().getGameMode() == GameMode.CREATIVE && event.getInventory().getType() == InventoryType.CREATIVE) if ((event.getInventory().getType() == InventoryType.CREATIVE || event.getInventory().getType() == InventoryType.PLAYER) && !event.getWhoClicked().isOp())
{ {
event.setCancelled(true); event.setCancelled(true);
event.getWhoClicked().closeInventory(); event.getWhoClicked().closeInventory();