Skip to content

Commit 5d515a5

Browse files
committed
🐛 fix null pointer exception when setting variables
semver: patch
1 parent 883fe0c commit 5d515a5

1 file changed

Lines changed: 20 additions & 28 deletions

File tree

EliteVA/Variables/VoiceAttackVariables.cs

Lines changed: 20 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,16 @@
55

66
namespace EliteVA.Variables;
77

8-
public class VoiceAttackVariables
8+
public class VoiceAttackVariables(dynamic vaProxy)
99
{
10-
private readonly dynamic _proxy;
11-
1210
public record Variable(string Name, dynamic Value, TypeCode Type);
1311

14-
private List<Variable> _setVariables;
12+
private List<Variable> _setVariables = [];
1513

1614
public IReadOnlyList<Variable> SetVariables => _setVariables.ToList();
1715

1816
public event EventHandler? OnVariablesSet;
1917

20-
public VoiceAttackVariables(dynamic vaProxy)
21-
{
22-
_proxy = vaProxy;
23-
_setVariables = [];
24-
}
25-
2618
public void ClearStartingWith(string name)
2719
{
2820
var variablesToClear = _setVariables.Where(x => x.Name.StartsWith(name)).ToList();
@@ -169,104 +161,104 @@ public void Clear(string name, TypeCode code)
169161

170162
private short? GetShort(string name)
171163
{
172-
return _proxy.GetSmallInt(name);
164+
return vaProxy.GetSmallInt(name);
173165
}
174166

175167
private int? GetInt(string name)
176168
{
177-
return _proxy.GetInt(name);
169+
return vaProxy.GetInt(name);
178170
}
179171

180172
private string GetText(string name)
181173
{
182-
return _proxy.GetText(name);
174+
return vaProxy.GetText(name);
183175
}
184176

185177
private decimal? GetDecimal(string name)
186178
{
187-
return _proxy.GetDecimal(name);
179+
return vaProxy.GetDecimal(name);
188180
}
189181

190182
private bool? GetBoolean(string name)
191183
{
192-
return _proxy.GetBoolean(name);
184+
return vaProxy.GetBoolean(name);
193185
}
194186

195187
private DateTime? GetDate(string name)
196188
{
197-
return _proxy.GetDate(name);
189+
return vaProxy.GetDate(name);
198190
}
199191

200192
private void SetShort(string name, short? value)
201193
{
202194
SetVariable(name, value, TypeCode.Int16);
203-
_proxy.SetSmallInt(name, value);
195+
vaProxy.SetSmallInt(name, value);
204196
}
205197

206198
private void ClearShort(string name)
207199
{
208200
ClearVariable(name);
209-
_proxy.SetSmallInt(name, null);
201+
vaProxy.SetSmallInt(name, null);
210202
}
211203

212204
private void SetInt(string name, int? value)
213205
{
214206
SetVariable(name, value, TypeCode.Int32);
215-
_proxy.SetInt(name, value);
207+
vaProxy.SetInt(name, value);
216208
}
217209

218210
private void ClearInt(string name)
219211
{
220212
ClearVariable(name);
221-
_proxy.SetInt(name, null);
213+
vaProxy.SetInt(name, null);
222214
}
223215

224216
private void SetText(string name, string value)
225217
{
226218
SetVariable(name, value, TypeCode.String);
227-
_proxy.SetText(name, value);
219+
vaProxy.SetText(name, value);
228220
}
229221

230222
private void ClearText(string name)
231223
{
232224
ClearVariable(name);
233-
_proxy.SetText(name, null);
225+
vaProxy.SetText(name, null);
234226
}
235227

236228
private void SetDecimal(string name, decimal? value)
237229
{
238230
SetVariable(name, value, TypeCode.Decimal);
239-
_proxy.SetDecimal(name, value);
231+
vaProxy.SetDecimal(name, value);
240232
}
241233

242234
private void ClearDecimal(string name)
243235
{
244236
ClearVariable(name);
245-
_proxy.SetDecimal(name, null);
237+
vaProxy.SetDecimal(name, null);
246238
}
247239

248240
private void SetBoolean(string name, bool? value)
249241
{
250242
SetVariable(name, value, TypeCode.Boolean);
251-
_proxy.SetBoolean(name, value);
243+
vaProxy.SetBoolean(name, value);
252244
}
253245

254246
private void ClearBoolean(string name)
255247
{
256248
ClearVariable(name);
257-
_proxy.SetBoolean(name, null);
249+
vaProxy.SetBoolean(name, null);
258250
}
259251

260252
private void SetDate(string name, DateTime? value)
261253
{
262254
SetVariable(name, value, TypeCode.DateTime);
263-
_proxy.SetDate(name, value);
255+
vaProxy.SetDate(name, value);
264256
}
265257

266258
private void ClearDate(string name)
267259
{
268260
ClearVariable(name);
269-
_proxy.SetDate(name, null);
261+
vaProxy.SetDate(name, null);
270262
}
271263

272264
private void SetVariable(string name, dynamic? value, TypeCode type)

0 commit comments

Comments
 (0)