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

Fixed the damage and idle sound getter being completely wrong.

Browse Source
This commit is contained in:
libraryaddict 2014-01-19 08:39:23 +13:00
parent f24eaa4854
commit 8535ccf2dd
4 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/me/libraryaddict/disguise/LibsDisguises.java
View File

@ -206,7 +206,7 @@ public class LibsDisguises extends JavaPlugin {
if (sound != null) {
Float soundStrength = ReflectionManager.getSoundModifier(nmsEntity);
if (soundStrength != null) {
sound.setDamageSoundVolume((Float) soundStrength);
sound.setDamageAndIdleSoundVolume((Float) soundStrength);
}
}

4
src/me/libraryaddict/disguise/utilities/DisguiseSound.java
View File

@ -151,7 +151,7 @@ public enum DisguiseSound {
}
}
public float getDamageSoundVolume() {
public float getDamageAndIdleSoundVolume() {
return damageSoundVolume;
}
@ -202,7 +202,7 @@ public enum DisguiseSound {
}
}
public void setDamageSoundVolume(float strength) {
public void setDamageAndIdleSoundVolume(float strength) {
this.damageSoundVolume = strength;
}

7
src/me/libraryaddict/disguise/utilities/PacketsManager.java
View File

@ -584,9 +584,8 @@ public class PacketsManager {
if (soundType == SoundType.HURT || soundType == SoundType.DEATH
|| soundType == SoundType.IDLE) {
// If the volume is the default
if (soundType != SoundType.IDLE
&& ((Float) mods.read(4)).equals(entitySound.getDamageSoundVolume())) {
mods.write(4, dSound.getDamageSoundVolume());
if (((Float) mods.read(4)).equals(entitySound.getDamageAndIdleSoundVolume())) {
mods.write(4, dSound.getDamageAndIdleSoundVolume());
}
// Here I assume its the default pitch as I can't calculate if its real.
if (disguise instanceof MobDisguise && disguisedEntity instanceof LivingEntity
@ -678,7 +677,7 @@ public class PacketsManager {
mods.write(1, (int) (loc.getX() * 8D));
mods.write(2, (int) (loc.getY() * 8D));
mods.write(3, (int) (loc.getZ() * 8D));
mods.write(4, disSound.getDamageSoundVolume());
mods.write(4, disSound.getDamageAndIdleSoundVolume());
float pitch;
if (disguise instanceof MobDisguise && !((MobDisguise) disguise).isAdult()) {
pitch = (new Random().nextFloat() - new Random().nextFloat()) * 0.2F + 1.5F;

20
src/me/libraryaddict/disguise/utilities/ReflectionManager.java
View File

@ -52,24 +52,18 @@ public class ReflectionManager {
private static String bukkitVersion = Bukkit.getServer().getClass().getName().split("\\.")[3];
private static Class itemClass;
private static Method soundMethod;
private static Method damageAndIdleSoundMethod;
static {
for (Method method : getNmsClass("EntityLiving").getDeclaredMethods()) {
try {
if (method.getReturnType() == float.class && Modifier.isProtected(method.getModifiers())
&& method.getParameterTypes().length == 0) {
Object entity = createEntityInstance("Pig");
Object entity = createEntityInstance("Cow");
method.setAccessible(true);
method.invoke(entity);
Field random = getNmsClass("Entity").getDeclaredField("random");
random.setAccessible(true);
random.set(entity, null);
method.setAccessible(true);
try {
method.invoke(entity);
} catch (Exception ex) {
soundMethod = method;
float value = (Float) method.invoke(entity);
if (value == 0.4F) {
damageAndIdleSoundMethod = method;
break;
}
}
@ -261,8 +255,8 @@ public class ReflectionManager {
public static Float getSoundModifier(Object entity) {
try {
soundMethod.setAccessible(true);
return (Float) soundMethod.invoke(entity);
damageAndIdleSoundMethod.setAccessible(true);
return (Float) damageAndIdleSoundMethod.invoke(entity);
} catch (Exception ex) {
}
return null;