Fixed selected hot bar for spectators spazzing out

Chipley · Mar 29, 2013 · 6fab2e3 · 6fab2e3
1 parent 7a81bb9
commit 6fab2e3
Showing 1 changed file with 6 additions and 29 deletions.
diff --git a/src/com/Chipmunk9998/Spectate/SpectateListener.java b/src/com/Chipmunk9998/Spectate/SpectateListener.java
@@ -31,7 +31,6 @@
 import org.bukkit.event.player.PlayerDropItemEvent;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerItemHeldEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerPickupItemEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
@@ -97,6 +96,9 @@ public void run() {
 						}
 
 						p.setFoodLevel(plugin.getServer().getPlayer(plugin.CommandExecutor.target.get(p.getName())).getFoodLevel());
+
+						((CraftPlayer)p).getHandle().inventory.itemInHandIndex = plugin.getServer().getPlayer(plugin.CommandExecutor.target.get(p.getName())).getInventory().getHeldItemSlot();
+						((CraftPlayer)p).getHandle().playerConnection.sendPacket(new Packet16BlockItemSwitch(plugin.getServer().getPlayer(plugin.CommandExecutor.target.get(p.getName())).getInventory().getHeldItemSlot()));
 
 					}
 
@@ -663,31 +665,6 @@ public void onPlayerCommand(PlayerCommandPreprocessEvent event) {
 
 	}
 
-	@EventHandler
-	public void onPlayerItemHeld(PlayerItemHeldEvent event) {
-
-		if (plugin.CommandExecutor.isBeingSpectated.contains(event.getPlayer().getName())) {
-
-			String[] spectators = plugin.CommandExecutor.spectator.get(event.getPlayer().getName()).split(",");
-
-			for (String player : spectators) {
-
-				Player p = plugin.getServer().getPlayer(player);
-
-				((CraftPlayer)p).getHandle().inventory.itemInHandIndex = event.getNewSlot();
-				((CraftPlayer)p).getHandle().playerConnection.sendPacket(new Packet16BlockItemSwitch(event.getNewSlot()));
-
-			}
-
-		}else if (plugin.CommandExecutor.isSpectating.contains(event.getPlayer().getName())) {
-
-			((CraftPlayer)event.getPlayer()).getHandle().inventory.itemInHandIndex = event.getPreviousSlot();
-			((CraftPlayer)event.getPlayer()).getHandle().playerConnection.sendPacket(new Packet16BlockItemSwitch(event.getPreviousSlot()));
-
-		}
-
-	}
-
 	public Location getThirdPersonLocation(Player player, boolean front) {
 
 		Location playerLoc = player.getLocation();
@@ -703,13 +680,13 @@ public Location getThirdPersonLocation(Player player, boolean front) {
 			v.multiply(currentSubtraction);
 
 			if (front) {
-				
+
 				playerLoc.add(v);
 
 			}else {
-				
+
 				playerLoc.subtract(v);
-				
+
 			}
 
 			Material tempMat = new Location(playerLoc.getWorld(), playerLoc.getX(), playerLoc.getY() + 1.5, playerLoc.getZ()).getBlock().getType();