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

Fix the errors due to health being changed to a float

Browse Source
This commit is contained in:
libraryaddict 2013-11-23 04:20:03 +13:00
parent 49b81b0deb
commit 86d728f90d
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/me/libraryaddict/disguise/PacketsManager.java
View File

@ -410,9 +410,20 @@ public class PacketsManager {
if (loc.equals(soundLoc)) { if (loc.equals(soundLoc)) {
entitySound = DisguiseSound.getType(entity.getType().name()); entitySound = DisguiseSound.getType(entity.getType().name());
if (entitySound != null) { if (entitySound != null) {
if (entity instanceof LivingEntity && ((LivingEntity) entity).getHealth() == 0) { Object obj = null;
soundType = SoundType.DEATH; if (entity instanceof LivingEntity) {
} else { try {
obj = LivingEntity.class.getMethod("getHealth").invoke(entity);
} catch (Exception e) {
e.printStackTrace();
}
if (obj instanceof Float && ((Float) obj) == 0 || ((Integer) obj) == 0) {
soundType = SoundType.DEATH;
} else {
obj = null;
}
}
if (obj == null) {
boolean hasInvun = false; boolean hasInvun = false;
Object nmsEntity = ReflectionManager.getNmsEntity(entity); Object nmsEntity = ReflectionManager.getNmsEntity(entity);
try { try {
@ -529,9 +540,20 @@ public class PacketsManager {
if (disSound == null) if (disSound == null)
return; return;
SoundType soundType = null; SoundType soundType = null;
if (entity instanceof LivingEntity && ((LivingEntity) entity).getHealth() == 0) { Object obj = null;
soundType = SoundType.DEATH; if (entity instanceof LivingEntity) {
} else { try {
obj = LivingEntity.class.getMethod("getHealth").invoke(entity);
} catch (Exception e) {
e.printStackTrace();
}
if (obj instanceof Float && ((Float) obj) == 0 || ((Integer) obj) == 0) {
soundType = SoundType.DEATH;
} else {
obj = null;
}
}
if (obj == null) {
soundType = SoundType.HURT; soundType = SoundType.HURT;
} }
if (disSound.getSound(soundType) == null if (disSound.getSound(soundType) == null