Added flying stuff

Chipley · Nov 7, 2013 · 8484d6f · 8484d6f
1 parent bf29eb8
commit 8484d6f
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 6 deletions.
diff --git a/src/com/Chipmunk9998/Spectate/PlayerState.java b/src/com/Chipmunk9998/Spectate/PlayerState.java
@@ -20,6 +20,8 @@ public class PlayerState {
 	public int level;
 	public float exp;
 	public int slot;
+	public boolean allowFlight;
+	public boolean isFlying;
 	public GameMode mode;
 	public Location location;
 
@@ -37,6 +39,8 @@ public PlayerState(Player p) {
 		level = p.getLevel();
 		exp = p.getExp();
 		slot = p.getInventory().getHeldItemSlot();
+		allowFlight = p.getAllowFlight();
+		isFlying = p.isFlying();
 		mode = p.getGameMode();
 		location = p.getLocation();
 

diff --git a/src/com/Chipmunk9998/Spectate/api/SpectateManager.java b/src/com/Chipmunk9998/Spectate/api/SpectateManager.java
@@ -99,9 +99,9 @@ public void run() {
 								p.damage(difference);
 
 							}else if (getTarget(p).getHealth() > p.getHealth()) {
-								
+
 								p.setHealth(getTarget(p).getHealth());
-								
+
 							}
 
 						}
@@ -140,6 +140,16 @@ public void run() {
 
 						p.getInventory().setHeldItemSlot(getTarget(p).getInventory().getHeldItemSlot());
 
+						if (getTarget(p).isFlying()) {
+
+							if (!p.isFlying()) {
+
+								p.setFlying(true);
+
+							}
+
+						}
+
 					}
 
 				}
@@ -207,7 +217,7 @@ public void startSpectating(Player p, Player target, boolean saveState) {
 			multiInvStates.put(p, new PlayerState(p));
 
 		}
-		
+
 		String playerListName = p.getPlayerListName();
 
 		if (getSpectateAngle(p) == SpectateAngle.FIRST_PERSON) {
@@ -221,7 +231,7 @@ public void startSpectating(Player p, Player target, boolean saveState) {
 		}
 
 		p.setPlayerListName(playerListName);
-		
+
 		p.setHealth(target.getHealth());
 
 		p.teleport(target);
@@ -247,6 +257,7 @@ public void startSpectating(Player p, Player target, boolean saveState) {
 		p.setFoodLevel(target.getFoodLevel());
 
 		setExperienceCooldown(p, Integer.MAX_VALUE);
+		p.setAllowFlight(true);
 
 		setSpectating(p, true);
 		setBeingSpectated(target, true);
@@ -679,7 +690,7 @@ private void setSpectating(Player p, boolean spectating) {
 
 	}
 
-	public void clickEnable(final Player player) {
+	public void disableScroll(final Player player, long ticks) {
 
 		if (!isClick.contains(player.getName())) {
 
@@ -693,13 +704,19 @@ public void run() {
 
 				}
 
-			}, 5L);
+			}, ticks);
 
 		}
 
 	}
 
 	public Location getSpectateLocation(Player p) {
+
+		if (getSpectateAngle(p) == SpectateAngle.FIRST_PERSON) {
+
+			return (getTarget(p).getLocation());
+
+		}
 
 		Location playerLoc = getTarget(p).getLocation();
 
@@ -797,6 +814,8 @@ private void loadFinalState(PlayerState state, Player toPlayer) {
 		toPlayer.setLevel(state.level);
 		toPlayer.setExp(state.exp);
 		toPlayer.getInventory().setHeldItemSlot(state.slot);
+		toPlayer.setAllowFlight(state.allowFlight);
+		toPlayer.setFlying(state.isFlying);
 		toPlayer.setGameMode(state.mode);
 
 		for (Player onlinePlayers : plugin.getServer().getOnlinePlayers()) {