Basic audio for 'spectral' attack

mcmonkeyprojects · Mar 28, 2016 · 66b8648 · 66b8648
1 parent f040e1e
commit 66b8648
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ Created by mcmonkey4eva on behalf of the Citizens and Denizen teams.
 **Beta**:
 
 - Ammo:
-	- Basically, optionally require ammo be fed into the NPC for bows/fireballs, or spare swords if the current sword breaks.
+	- Basically, optionally require ammo be fed into the NPC for bows/fireballs, or spare swords if the current sword breaks. (waiting on Citizens2 issue 721)
 - Mounting:
 	- Ride a horse or whatever other NPC (waiting on Citizens2 issue 719)
 - Commands:

diff --git a/src/main/java/org/mcmonkey/sentinel/SentinelTrait.java b/src/main/java/org/mcmonkey/sentinel/SentinelTrait.java
@@ -10,6 +10,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.Sound;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.craftbukkit.v1_9_R1.CraftWorld;
 import org.bukkit.enchantments.Enchantment;
@@ -633,7 +634,7 @@ else if (usesLightning()) {
                 }
                 timeSinceAttack = 0;
                 swingWeapon();
-                entity.getWorld().strikeLightning(entity.getLocation()); // TODO: Audio?
+                entity.getWorld().strikeLightning(entity.getLocation());
                 if (needsAmmo) {
                     takeOne();
                     grabNextItem();
@@ -651,7 +652,7 @@ else if (usesSpectral()) {
                 timeSinceAttack = 0;
                 if (!entity.isGlowing()) {
                     swingWeapon();
-                    // TODO: Audio?
+                    entity.getWorld().playSound(entity.getLocation(), Sound.ENTITY_VILLAGER_YES, 1f, 1f); // TODO: Better sound!
                     entity.setGlowing(true);
                     if (needsAmmo) {
                         takeOne();