SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed entity damage sounds and check if entity can age before modifying pitch

Browse Source
This commit is contained in:
Andrew 2013-07-23 06:38:54 +12:00
parent dbffa801c7
commit 18ea8e079c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/me/libraryaddict/disguise/DisguiseAPI.java
View File

@ -167,10 +167,11 @@ public class DisguiseAPI {
// If the volume is the default // If the volume is the default
if (soundType != SoundType.IDLE if (soundType != SoundType.IDLE
&& ((Float) mods.read(4)).equals(entitySound.getDamageSoundVolume())) { && ((Float) mods.read(4)).equals(entitySound.getDamageSoundVolume())) {
mods.write(4, entitySound.getDamageSoundVolume()); mods.write(4, dSound.getDamageSoundVolume());
} }
// Here I assume its the default pitch as I can't calculate if its real. // Here I assume its the default pitch as I can't calculate if its real.
if (disguise instanceof MobDisguise && disguisedEntity instanceof LivingEntity) { if (disguise instanceof MobDisguise && disguisedEntity instanceof LivingEntity
&& ((MobDisguise) disguise).doesDisguiseAge()) {
boolean baby = ((CraftLivingEntity) disguisedEntity).getHandle().isBaby(); boolean baby = ((CraftLivingEntity) disguisedEntity).getHandle().isBaby();
if (((MobDisguise) disguise).isAdult() == baby) { if (((MobDisguise) disguise).isAdult() == baby) {
@ -194,8 +195,6 @@ public class DisguiseAPI {
// Max = 1.2 // Max = 1.2
// Cap = 75.6 // Cap = 75.6
} }
if (disguise.getType() == DisguiseType.BAT)
pitch *= 0.95F;
pitch *= 63; pitch *= 63;
if (pitch < 0) if (pitch < 0)
pitch = 0; pitch = 0;