Merge branch 'master' of https://bitbucket.org/simplyianm/crimsonadmin

Conflicts: src/main/java/com/crimsonrpg/admin/listeners/CAEntityListener.java
macalinao · Nov 27, 2011 · c4df6f7 · c4df6f7
2 parents e4aeda8 + 172a6dc
commit c4df6f7
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/main/java/com/crimsonrpg/admin/listeners/CAEntityListener.java b/src/main/java/com/crimsonrpg/admin/listeners/CAEntityListener.java
@@ -15,6 +15,7 @@
 
 import com.crimsonrpg.admin.CrimsonAdmin;
 import com.crimsonrpg.items.api.ItemAPI;
+import org.bukkit.Location;
 
 /**
  *
@@ -47,6 +48,8 @@ public void onEntityDamage(EntityDamageEvent event) {
 
                 if (entity instanceof Player) {
                     SpoutPlayer target = (SpoutPlayer) event.getEntity();
+                    Location loc = new Location(target.getWorld(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ());
+                    SpoutManager.getSoundManager().playGlobalCustomSoundEffect(ca, "http://resources.crimsonrpg.com/s/audio/BanHammerAudio.ogg", true, loc);
                     target.setBanned(true);
                     target.kickPlayer("Teh BanHammer haz spokez!! :D");
                     event.setCancelled(true);