From c1ad45e5554a67967724688022304e2f01858793 Mon Sep 17 00:00:00 2001
From: Connor Monahan <cmastudios@me.com>
Date: Mon, 6 Jun 2016 18:13:09 -0400
Subject: [PATCH] Fix #833, fix #832

---
 war/pom.xml                                               | 8 ++++----
 .../java/com/tommytony/war/event/WarEntityListener.java   | 3 ++-
 .../java/com/tommytony/war/event/WarPlayerListener.java   | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/war/pom.xml b/war/pom.xml
index 81f9e1e..2182c83 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -16,12 +16,12 @@
   </properties>
   <repositories>
     <repository>
-      <id>bukkit-repo</id>
-      <url>http://repo.bukkit.org/content/groups/public</url>
+      <id>spigot-repo</id>
+      <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
     </repository>
     <repository>
       <id>cma-repo</id>
-      <url>http://maven.cmastudios.me/archiva/repository/internal</url>
+      <url>http://ftp.cmastudios.me/maven/</url>
     </repository>
     <repository>
       <id>tagapi-repo</id>
@@ -117,7 +117,7 @@
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>bukkit</artifactId>
-      <version>1.7.2-R0.2</version>
+      <version>1.9.4-R0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.kitteh</groupId>
diff --git a/war/src/main/java/com/tommytony/war/event/WarEntityListener.java b/war/src/main/java/com/tommytony/war/event/WarEntityListener.java
index bd078a5..6cf4fe7 100644
--- a/war/src/main/java/com/tommytony/war/event/WarEntityListener.java
+++ b/war/src/main/java/com/tommytony/war/event/WarEntityListener.java
@@ -31,6 +31,7 @@ import org.bukkit.event.entity.ProjectileHitEvent;
 import org.bukkit.event.entity.ProjectileLaunchEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.metadata.FixedMetadataValue;
+import org.bukkit.projectiles.ProjectileSource;
 import org.bukkit.util.Vector;
 
 import com.tommytony.war.Team;
@@ -483,7 +484,7 @@ public class WarEntityListener implements Listener {
 			return;
 		}
 		if (event.getEntityType() == EntityType.EGG) {
-			LivingEntity shooter = event.getEntity().getShooter();
+			ProjectileSource shooter = event.getEntity().getShooter();
 			if (shooter instanceof Player) {
 				Player player = (Player) shooter;
 				Warzone zone = Warzone.getZoneByPlayerName(player.getName());
diff --git a/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java b/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java
index 321ddff..2cfd290 100644
--- a/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java
+++ b/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java
@@ -260,7 +260,7 @@ public class WarPlayerListener implements Listener {
 				// Whenever a player dies in the middle of conflict they will
 				// likely respawn still trying to use their items to attack
 				// another player.
-				player.playSound(player.getLocation(), Sound.ITEM_BREAK, 1, 0);
+				player.playSound(player.getLocation(), Sound.ENTITY_ITEM_BREAK, 1, 0);
 			} 
 
 			if (zone != null && event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getClickedBlock().getType() == Material.ENDER_CHEST && !zone.getWarzoneConfig().getBoolean(WarzoneConfig.ALLOWENDER)) {
@@ -953,7 +953,7 @@ public class WarPlayerListener implements Listener {
 		// Prevent thieves from taking their bomb/wool/cake into a chest, etc.
 		if (zone.isThief(player.getName())) {
 			event.setCancelled(true);
-			player.playSound(player.getLocation(), Sound.FIZZ, 10, 10);
+			player.playSound(player.getLocation(), Sound.BLOCK_LAVA_EXTINGUISH, 10, 10);
 		} else // Magically give player a wool block when they click their helmet
 			if (event.getSlotType() == InventoryType.SlotType.ARMOR && event.getSlot() == 39
 				&& zone.getWarzoneConfig().getBoolean(WarzoneConfig.BLOCKHEADS)) {
@@ -977,7 +977,7 @@ public class WarPlayerListener implements Listener {
 		}
 		if (zone.isImportantBlock(event.getBlockClicked())) {
 			event.setCancelled(true);
-			player.playSound(player.getLocation(), Sound.FIZZ, 10, 10);
+			player.playSound(player.getLocation(), Sound.BLOCK_LAVA_EXTINGUISH, 10, 10);
 		}
 	}
 }