From b168a7926ff14e6acd9d806185b378aac7b808d6 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Fri, 9 Oct 2020 20:45:33 +0200 Subject: [PATCH] Fix exceptions when hovering over an item with a broken texture. --- Content.Client/ClickMapManager.cs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Content.Client/ClickMapManager.cs b/Content.Client/ClickMapManager.cs index 36d5382157..b25e58e033 100644 --- a/Content.Client/ClickMapManager.cs +++ b/Content.Client/ClickMapManager.cs @@ -69,7 +69,18 @@ namespace Content.Client return false; } - var offset = rsiData.Offsets[state][(int) dir][frame]; + if (!rsiData.Offsets.TryGetValue(state, out var stateDat) || stateDat.Length <= (int) dir) + { + return false; + } + + var dirDat = stateDat[(int) dir]; + if (dirDat.Length <= frame) + { + return false; + } + + var offset = dirDat[frame]; return SampleClickMap(rsiData.ClickMap, pos, rsi.Size, offset); }