Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-08-24 00:34:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rearrange gen3/4 deferral enum

Browse Source 
null check necessary for unset deferral needing to ignore max
This commit is contained in:
Kurt
2025-07-12 01:29:37 -05:00
parent 6a9af0a4a3
commit b4edc389bb
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PKHeX.Core/Legality/Encounters/Generator/ByGeneration/EncounterGenerator3.cs
View File

@@ -28,11 +28,11 @@ private enum DeferralType
// Legal
None,
PIDIVDefer,
SlotNumber,
// Illegal
PIDIV,
Ball,
SlotNumber,
PIDIV,
}
private struct Deferral
@@ -42,7 +42,7 @@ private struct Deferral
public void Update(DeferralType type, IEncounterable enc)
{
if (Type >= type)
if (type >= Type && Encounter is not null)
return;
Type = type;
Encounter = enc;

8
PKHeX.Core/Legality/Encounters/Generator/ByGeneration/EncounterGenerator4.cs
View File

@@ -35,10 +35,10 @@ private enum DeferralType
PIDIVDefer,
// Illegal
PIDIV,
Tile,
Ball,
SlotNumber,
Ball,
Tile,
PIDIV,
}
private struct Deferral
@@ -48,7 +48,7 @@ private struct Deferral
public void Update(DeferralType type, IEncounterable enc)
{
if (Type >= type)
if (type >= Type && Encounter is not null)
return;
Type = type;
Encounter = enc;