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

Reformatted

Browse Source
This commit is contained in:
libraryaddict 2021-08-06 07:35:17 +12:00
parent 565a06731b
commit fc97a5952b
1 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerSounds.java
View File

@ -108,8 +108,7 @@ public class PacketListenerSounds extends PacketAdapter {
} }
} }
if (disguise != null && disguise.isSoundsReplaced() && if (disguise != null && disguise.isSoundsReplaced() && (disguise.isSelfDisguiseSoundsReplaced() || disguisedEntity != observer)) {
(disguise.isSelfDisguiseSoundsReplaced() || disguisedEntity != observer)) {
Object sound = null; Object sound = null;
SoundGroup disguiseSound = SoundGroup.getGroup(disguise); SoundGroup disguiseSound = SoundGroup.getGroup(disguise);
@ -133,8 +132,7 @@ public class PacketListenerSounds extends PacketAdapter {
} }
// 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()) {
((MobDisguise) disguise).doesDisguiseAge()) {
boolean baby = false; boolean baby = false;
if (disguisedEntity instanceof Zombie) { if (disguisedEntity instanceof Zombie) {
@ -150,16 +148,14 @@ public class PacketListenerSounds extends PacketAdapter {
return; return;
} }
pitch = (DisguiseUtilities.random.nextFloat() - pitch = (DisguiseUtilities.random.nextFloat() - DisguiseUtilities.random.nextFloat()) * 0.2F + 1.5F;
DisguiseUtilities.random.nextFloat()) * 0.2F + 1.5F;
} else { } else {
// If the pitch is not the expected // If the pitch is not the expected
if (pitch < 1 || pitch > 1.2) { if (pitch < 1 || pitch > 1.2) {
return; return;
} }
pitch = (DisguiseUtilities.random.nextFloat() - pitch = (DisguiseUtilities.random.nextFloat() - DisguiseUtilities.random.nextFloat()) * 0.2F + 1.0F;
DisguiseUtilities.random.nextFloat()) * 0.2F + 1.0F;
} }
} }
} }
@ -201,8 +197,7 @@ public class PacketListenerSounds extends PacketAdapter {
Entity entity = disguise.getEntity(); Entity entity = disguise.getEntity();
if (!disguise.getType().isPlayer() && if (!disguise.getType().isPlayer() && (disguise.isSelfDisguiseSoundsReplaced() || entity != event.getPlayer())) {
(disguise.isSelfDisguiseSoundsReplaced() || entity != event.getPlayer())) {
SoundGroup disSound = SoundGroup.getGroup(entity.getType().name()); SoundGroup disSound = SoundGroup.getGroup(entity.getType().name());
if (disSound == null) { if (disSound == null) {
@ -216,8 +211,7 @@ public class PacketListenerSounds extends PacketAdapter {
soundType = SoundType.DEATH; soundType = SoundType.DEATH;
} }
if (disSound.getSound(soundType) == null || if (disSound.getSound(soundType) == null || (disguise.isSelfDisguiseSoundsReplaced() && entity == event.getPlayer())) {
(disguise.isSelfDisguiseSoundsReplaced() && entity == event.getPlayer())) {
if (disguise.isSelfDisguiseSoundsReplaced() && entity == event.getPlayer()) { if (disguise.isSelfDisguiseSoundsReplaced() && entity == event.getPlayer()) {
cancelSound = !cancelSound; cancelSound = !cancelSound;
@ -234,8 +228,7 @@ public class PacketListenerSounds extends PacketAdapter {
if (sound != null) { if (sound != null) {
Location loc = entity.getLocation(); Location loc = entity.getLocation();
PacketContainer packet = new PacketContainer( PacketContainer packet = new PacketContainer(
sound.getClass().getSimpleName().equals("MinecraftKey") ? sound.getClass().getSimpleName().equals("MinecraftKey") ? Server.CUSTOM_SOUND_EFFECT : Server.NAMED_SOUND_EFFECT);
Server.CUSTOM_SOUND_EFFECT : Server.NAMED_SOUND_EFFECT);
mods = packet.getModifier(); mods = packet.getModifier();
@ -249,25 +242,15 @@ public class PacketListenerSounds extends PacketAdapter {
float pitch; float pitch;
if (disguise instanceof MobDisguise && !((MobDisguise) disguise).isAdult()) { if (disguise instanceof MobDisguise && !((MobDisguise) disguise).isAdult()) {
pitch = (DisguiseUtilities.random.nextFloat() - DisguiseUtilities.random.nextFloat()) * pitch = (DisguiseUtilities.random.nextFloat() - DisguiseUtilities.random.nextFloat()) * 0.2F + 1.5F;
0.2F + 1.5F;
} else { } else {
pitch = (DisguiseUtilities.random.nextFloat() - DisguiseUtilities.random.nextFloat()) * pitch = (DisguiseUtilities.random.nextFloat() - DisguiseUtilities.random.nextFloat()) * 0.2F + 1.0F;
0.2F + 1.0F;
} }
if (disguise.getType() == DisguiseType.BAT) { if (disguise.getType() == DisguiseType.BAT) {
pitch *= 0.95F; pitch *= 0.95F;
} }
/* pitch *= 63;
if (pitch < 0)
pitch = 0;
if (pitch > 255)
pitch = 255;*/
mods.write(6, pitch); mods.write(6, pitch);
try { try {