morpheus/Meteor-Rejects
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #171 from GoldenStack/fix-sound-locator-npe

Browse Source 
Fix sound locator NPE
This commit is contained in:
SByte
2022-10-30 10:54:55 +07:00
committed by GitHub
parent ddf7becd75 eb3d39a4d5
commit a27f383b06
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/anticope/rejects/modules/SoundLocator.java
View File

@@ -13,6 +13,7 @@ import net.minecraft.client.sound.SoundInstance;
import net.minecraft.client.sound.WeightedSoundSet; import net.minecraft.client.sound.WeightedSoundSet;
import net.minecraft.sound.SoundEvent; import net.minecraft.sound.SoundEvent;
import net.minecraft.text.MutableText; import net.minecraft.text.MutableText;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting; import net.minecraft.util.Formatting;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
@@ -46,7 +47,14 @@ public class SoundLocator extends Module {
private void printSound(SoundInstance sound) { private void printSound(SoundInstance sound) {
WeightedSoundSet soundSet = mc.getSoundManager().get(sound.getId()); WeightedSoundSet soundSet = mc.getSoundManager().get(sound.getId());
MutableText text = soundSet.getSubtitle().copy(); MutableText text;
if (soundSet == null) {
text = Text.literal(sound.getId().toString());
} else if (soundSet.getSubtitle() == null) {
text = Text.literal(soundSet.getId().toString());
} else {
text = soundSet.getSubtitle().copy();
}
text.append(String.format("%s at ", Formatting.RESET)); text.append(String.format("%s at ", Formatting.RESET));
Vec3d pos = new Vec3d(sound.getX(), sound.getY(), sound.getZ()); Vec3d pos = new Vec3d(sound.getX(), sound.getY(), sound.getZ());
text.append(ChatUtils.formatCoords(pos)); text.append(ChatUtils.formatCoords(pos));