summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorGJ <gjmcferrin@gmail.com>2013-12-06 10:37:22 -0500
committerNate Mortensen <nate.richard.mortensen@gmail.com>2013-12-16 19:48:16 -0700
commitbe55b4f5b8274c1124fe957e6a3259789f6e9747 (patch)
tree167927a167b324e50f87feca51855a85868885f7 /src/main
parentd8b48c2ec9f38a921ac54f5655a2da2d88f10ec5 (diff)
downloadbukkit-be55b4f5b8274c1124fe957e6a3259789f6e9747.tar
bukkit-be55b4f5b8274c1124fe957e6a3259789f6e9747.tar.gz
bukkit-be55b4f5b8274c1124fe957e6a3259789f6e9747.tar.lz
bukkit-be55b4f5b8274c1124fe957e6a3259789f6e9747.tar.xz
bukkit-be55b4f5b8274c1124fe957e6a3259789f6e9747.zip
[Bleeding] Correct naming of sounds for Minecraft 1.7. Fixes BUKKIT-5065
Several sounds were renamed in Minecraft 1.7 and have been updated accordingly. Additionally, two sounds, HURT and BREATH, were removed from Minecraft.
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/bukkit/Sound.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
index 77261c28..09135300 100644
--- a/src/main/java/org/bukkit/Sound.java
+++ b/src/main/java/org/bukkit/Sound.java
@@ -16,7 +16,6 @@ public enum Sound {
ANVIL_LAND,
ANVIL_USE,
ARROW_HIT,
- BREATH,
BURP,
CHEST_CLOSE,
CHEST_OPEN,
@@ -33,7 +32,6 @@ public enum Sound {
FIZZ,
FUSE,
GLASS,
- HURT,
HURT_FLESH,
ITEM_BREAK,
ITEM_PICKUP,
@@ -158,6 +156,7 @@ public enum Sound {
ZOMBIE_INFECT,
ZOMBIE_UNFECT,
ZOMBIE_REMEDY,
+ ZOMBIE_WALK,
ZOMBIE_PIG_IDLE,
ZOMBIE_PIG_ANGRY,
ZOMBIE_PIG_DEATH,
@@ -183,6 +182,7 @@ public enum Sound {
HORSE_ANGRY,
HORSE_ARMOR,
HORSE_BREATHE,
+ HORSE_DEATH,
HORSE_GALLOP,
HORSE_HIT,
HORSE_IDLE,
@@ -196,6 +196,7 @@ public enum Sound {
DONKEY_HIT,
DONKEY_IDLE,
HORSE_SKELETON_DEATH,
+ HORSE_SKELETON_HIT,
HORSE_SKELETON_IDLE,
HORSE_ZOMBIE_DEATH,
HORSE_ZOMBIE_HIT,