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

removing switching players until spigot patch is on.

This commit is contained in:
Sarah 2016-01-25 05:44:06 +01:00
parent 9e63c9000a
commit f722831e6a
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameSpectatorManager.java
View File

@ -14,6 +14,7 @@ import mineplex.core.updater.event.UpdateEvent;
import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.game.Game.GameState; import nautilus.game.arcade.game.Game.GameState;
import org.bukkit.Bukkit;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
@ -22,6 +23,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.block.Action; import org.bukkit.event.block.Action;
import org.bukkit.event.block.BlockDamageEvent;
import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.event.player.PlayerInteractEntityEvent;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
@ -51,6 +53,14 @@ public class GameSpectatorManager implements Listener
if (!Manager.GetGame().IsAlive(player)) if (!Manager.GetGame().IsAlive(player))
event.setCancelled(true); event.setCancelled(true);
//processClick(player, event.getAction());
}
/*public void processClick(Player player, Action action)
{
if (Manager.GetGame() == null)
return;
if(!Manager.GetGame().AllowEntitySpectate) if(!Manager.GetGame().AllowEntitySpectate)
return; return;
@ -75,7 +85,7 @@ public class GameSpectatorManager implements Listener
break; break;
} }
if(event.getAction() == Action.LEFT_CLICK_AIR || event.getAction() == Action.LEFT_CLICK_BLOCK) if(action == Action.LEFT_CLICK_AIR || action == Action.LEFT_CLICK_BLOCK)
currentPlayer = currentPlayer - 2; currentPlayer = currentPlayer - 2;
if(currentPlayer < 0) if(currentPlayer < 0)
@ -90,7 +100,7 @@ public class GameSpectatorManager implements Listener
Player specPlayer = players.get(currentPlayer); Player specPlayer = players.get(currentPlayer);
setSpectating(player, specPlayer); setSpectating(player, specPlayer);
} }*/
@EventHandler(priority = EventPriority.LOW) @EventHandler(priority = EventPriority.LOW)
public void interactEntityCancel(PlayerInteractEntityEvent event) public void interactEntityCancel(PlayerInteractEntityEvent event)