diff --git a/docs/src/progress/currenttarget.md b/docs/src/progress/currenttarget.md index 8e7ebefc..de158051 100644 --- a/docs/src/progress/currenttarget.md +++ b/docs/src/progress/currenttarget.md @@ -45,9 +45,11 @@ + bug fixes Fix idle animations Fix light cluster mapping for foliage shader + Fix foliage placement Fix lights not being deleted - Not sending a "light count" var to light calculations, so the data stays in buffer even though it is not being updated Fix block tree preventing initiating an attack + Fix equipping sword on toolbar Fix return to title menu synchronization bug + unreproducible bugs diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index bc9053b8..f7a5066e 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -875,7 +875,7 @@ Fix SP debug launcher actually entering world Fix virtual scrollable clipping logic Fix ui scaling on abnormal monitors - This is literally just a function of the settings file not being updated for different resolutions - +Fix inventory null pointer check on virtualaudiomanager diff --git a/src/main/java/electrosphere/renderer/ui/components/ToolbarInventoryPanel.java b/src/main/java/electrosphere/renderer/ui/components/ToolbarInventoryPanel.java index 9d7680c4..4078d551 100644 --- a/src/main/java/electrosphere/renderer/ui/components/ToolbarInventoryPanel.java +++ b/src/main/java/electrosphere/renderer/ui/components/ToolbarInventoryPanel.java @@ -200,10 +200,12 @@ public class ToolbarInventoryPanel { } } Item itemData = Globals.gameConfigCurrent.getItemMap().getItem(ItemUtils.getType(Globals.draggedItem)); - if(itemData.getItemAudio() != null && itemData.getItemAudio().getUIReleaseAudio() != null){ - Globals.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIReleaseAudio(), VirtualAudioSourceType.UI, false); - } else { - Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_RELEASE, VirtualAudioSourceType.UI, false); + if(Globals.virtualAudioSourceManager != null){ + if(itemData.getItemAudio() != null && itemData.getItemAudio().getUIReleaseAudio() != null){ + Globals.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIReleaseAudio(), VirtualAudioSourceType.UI, false); + } else { + Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_RELEASE, VirtualAudioSourceType.UI, false); + } } //update ui Globals.dragSourceInventory = null;