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

Only clone sounds when needed, minor cleanup. Thanks again Jok on discord for pointing this out!

Browse Source
This commit is contained in:
libraryaddict 2021-11-11 21:00:45 +13:00
parent 90f23f92d3
commit e7b370733f
1 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,17 +38,9 @@ public class PacketListenerSounds extends PacketAdapter {
@Override @Override
public void onPacketSending(PacketEvent event) { public void onPacketSending(PacketEvent event) {
if (event.isCancelled()) { if (event.isCancelled() || event.isAsync() || event.isPlayerTemporary()) {
return; return;
} }
if (event.isAsync()) {
return;
}
if (event.getPlayer().getName().contains("UNKNOWN[")) {
return;
}
event.setPacket(event.getPacket().shallowClone());
if (event.getPacketType() == Server.ENTITY_STATUS) { if (event.getPacketType() == Server.ENTITY_STATUS) {
handleEntityStatus(event); handleEntityStatus(event);
@ -106,6 +98,7 @@ public class PacketListenerSounds extends PacketAdapter {
soundType = SoundType.DEATH; soundType = SoundType.DEATH;
} }
} }
if (disguise != null) { if (disguise != null) {
break; break;
} }
@ -169,6 +162,9 @@ public class PacketListenerSounds extends PacketAdapter {
event.setPacket(newPacket); event.setPacket(newPacket);
} else { } else {
event.setPacket(event.getPacket().shallowClone());
mods = event.getPacket().getModifier();
mods.write(0, sound); mods.write(0, sound);
mods.write(1, soundCat); mods.write(1, soundCat);
mods.write(5, volume); mods.write(5, volume);
@ -214,6 +210,7 @@ public class PacketListenerSounds extends PacketAdapter {
if (entity == event.getPlayer() && !disguise.getType().isPlayer()) { if (entity == event.getPlayer() && !disguise.getType().isPlayer()) {
if (!disguise.isSelfDisguiseSoundsReplaced()) { if (!disguise.isSelfDisguiseSoundsReplaced()) {
cancelSound = !cancelSound; cancelSound = !cancelSound;
if (cancelSound) { if (cancelSound) {
return; return;
} }
@ -226,48 +223,49 @@ public class PacketListenerSounds extends PacketAdapter {
return; return;
} }
if (disSound.getSound(soundType) != null) { Object sound = disSound.getSound(soundType);
disSound = SoundGroup.getGroup(disguise); if (sound == null) {
return;
}
if (disSound != null) { disSound = SoundGroup.getGroup(disguise);
Object sound = disSound.getSound(soundType);
if (sound != null) { if (disSound == null) {
Location loc = entity.getLocation(); return;
PacketContainer packet = new PacketContainer( }
sound.getClass().getSimpleName().equals("MinecraftKey") ? Server.CUSTOM_SOUND_EFFECT : Server.NAMED_SOUND_EFFECT);
mods = packet.getModifier(); Location loc = entity.getLocation();
PacketContainer packet =
new PacketContainer(sound.getClass().getSimpleName().equals("MinecraftKey") ? Server.CUSTOM_SOUND_EFFECT : Server.NAMED_SOUND_EFFECT);
mods.write(0, sound); mods = packet.getModifier();
mods.write(1, ReflectionManager.getSoundCategory(disguise.getType())); // Meh
mods.write(2, (int) (loc.getX() * 8D));
mods.write(3, (int) (loc.getY() * 8D));
mods.write(4, (int) (loc.getZ() * 8D));
mods.write(5, disSound.getDamageAndIdleSoundVolume());
float pitch; mods.write(0, sound);
mods.write(1, ReflectionManager.getSoundCategory(disguise.getType())); // Meh
mods.write(2, (int) (loc.getX() * 8D));
mods.write(3, (int) (loc.getY() * 8D));
mods.write(4, (int) (loc.getZ() * 8D));
mods.write(5, disSound.getDamageAndIdleSoundVolume());
if (disguise instanceof MobDisguise && !((MobDisguise) disguise).isAdult()) { float pitch;
pitch = (DisguiseUtilities.random.nextFloat() - DisguiseUtilities.random.nextFloat()) * 0.2F + 1.4F;
} else {
pitch = (DisguiseUtilities.random.nextFloat() - DisguiseUtilities.random.nextFloat()) * 0.2F + 1.0F;
}
if (disguise.getType() == DisguiseType.BAT) { if (disguise instanceof MobDisguise && !((MobDisguise) disguise).isAdult()) {
pitch *= 0.95F; pitch = (DisguiseUtilities.random.nextFloat() - DisguiseUtilities.random.nextFloat()) * 0.2F + 1.4F;
} } else {
pitch = (DisguiseUtilities.random.nextFloat() - DisguiseUtilities.random.nextFloat()) * 0.2F + 1.0F;
}
mods.write(6, pitch); if (disguise.getType() == DisguiseType.BAT) {
pitch *= 0.95F;
}
try { mods.write(6, pitch);
ProtocolLibrary.getProtocolManager().sendServerPacket(observer, packet, false);
} catch (InvocationTargetException e) { try {
e.printStackTrace(); ProtocolLibrary.getProtocolManager().sendServerPacket(observer, packet, false);
} } catch (InvocationTargetException e) {
} e.printStackTrace();
}
} }
} }
} }