diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt index e98a90f2e..82b747d3b 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt @@ -261,6 +261,7 @@ class UIInventoryFull( // UI items categoryBar.render(batch, camera) + transitionPanel.render(batch, camera) // render map while visible /*if (currentScreenTransition > 1f + epsilon) { diff --git a/src/net/torvald/terrarum/modulebasegame/weather/WeatherMixer.kt b/src/net/torvald/terrarum/modulebasegame/weather/WeatherMixer.kt index b6650b9c8..5b6362b44 100644 --- a/src/net/torvald/terrarum/modulebasegame/weather/WeatherMixer.kt +++ b/src/net/torvald/terrarum/modulebasegame/weather/WeatherMixer.kt @@ -300,13 +300,13 @@ internal object WeatherMixer : RNGConsumer { var mixFrom: String? try { mixFrom = JSON.get("mixFrom").asJsonPrimitive.asString } - catch (e: NullPointerException) { mixFrom = null } + catch (e: IllegalStateException) { mixFrom = null } var mixPercentage: Double? try { mixPercentage = JSON.get("mixPercentage").asJsonPrimitive.asDouble } - catch (e: NullPointerException) { mixPercentage = null } + catch (e: IllegalStateException) { mixPercentage = null }