Deukhoofd
/
PkmnLibSharp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes for scopedowner.

This commit is contained in:
Deukhoofd 2021-01-16 14:48:07 +01:00
parent 7807ee9676
commit d5bbc18b1a
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
PkmnLibSharp/Utilities/ScopedOwner.cs
View File

@ -10,6 +10,7 @@ namespace PkmnLibSharp.Utilities
public class ScopedOwner<T> : IDisposable where T : PointerWrapper public class ScopedOwner<T> : IDisposable where T : PointerWrapper
{ {
public T? Value { get; private set; } public T? Value { get; private set; }
private bool _isOwner = true;
public ScopedOwner(T value) public ScopedOwner(T value)
{ {
@ -18,19 +19,16 @@ namespace PkmnLibSharp.Utilities
public T? TakeOwnership() public T? TakeOwnership()
{ {
var val = Value; _isOwner = false;
Value = null; return Value;
return val;
} }
~ScopedOwner() ~ScopedOwner()
{ {
if (Value != null) if (_isOwner && Value != null)
Value.Dispose(); Value.Dispose();
} }
public static implicit operator T?(ScopedOwner<T> val) => val.Value;
public override string ToString() public override string ToString()
{ {
if (Value == null) return "null"; if (Value == null) return "null";
@ -39,7 +37,7 @@ namespace PkmnLibSharp.Utilities
public void Dispose() public void Dispose()
{ {
if (Value != null) if (_isOwner && Value != null)
Value.Dispose(); Value.Dispose();
Value = null; Value = null;
} }

2
PkmnLibSharpTests/Battling/BattleTests/BasicBattleTests.cs
View File

@ -30,7 +30,7 @@ namespace PkmnLibSharpTests.Battling.BattleTests
party.SwapInto(0, party.SwapInto(0,
new PokemonBuilder(lib, "testSpecies", 50) new PokemonBuilder(lib, "testSpecies", 50)
.LearnMove("testMove", MoveLearnMethod.Unknown) .LearnMove("testMove", MoveLearnMethod.Unknown)
.Build()); .Build().TakeOwnership());
return party; return party;
} }