@@ -64,38 +64,39 @@ private void OnHandlerChanged() {
6464
6565 public EffectLayer Render ( IGameState gs )
6666 {
67- if ( OverrideLogic != null )
67+ try
6868 {
69- // For every property which has an override logic assigned
70- foreach ( var ( key , overrideLogic ) in OverrideLogic )
71- // Set the value of the logic evaluation as the override for this property
69+ if ( OverrideLogic != null )
7270 {
73- var value = overrideLogic . Evaluate ( gs ) ;
74- try
71+ // For every property which has an override logic assigned
72+ foreach ( var ( key , overrideLogic ) in OverrideLogic )
73+ // Set the value of the logic evaluation as the override for this property
7574 {
76- if ( overrideLogic . VarType is { IsEnum : true } )
75+ var value = overrideLogic . Evaluate ( gs ) ;
76+ try
7777 {
78- Handler . Properties . SetOverride ( key ,
79- value == null ? null : Enum . ToObject ( overrideLogic . VarType , value ) ) ;
78+ if ( overrideLogic . VarType is { IsEnum : true } )
79+ {
80+ Handler . Properties . SetOverride ( key ,
81+ value == null ? null : Enum . ToObject ( overrideLogic . VarType , value ) ) ;
82+ }
83+ else
84+ {
85+ Handler . Properties . SetOverride ( key , value ) ;
86+ }
8087 }
81- else
88+ catch ( OverrideNameRefactoredException )
8289 {
83- Handler . Properties . SetOverride ( key , value ) ;
90+ OverrideLogic . Remove ( key ) ;
91+ OverrideLogic . Add ( key [ 1 ..] , overrideLogic ) ;
92+ break ;
8493 }
8594 }
86- catch ( OverrideNameRefactoredException )
87- {
88- OverrideLogic . Remove ( key ) ;
89- OverrideLogic . Add ( key [ 1 ..] , overrideLogic ) ;
90- break ;
91- }
9295 }
93- }
9496
95- if ( ! Handler . Properties . Enabled )
96- return EmptyLayer . Instance ;
97- try
98- {
97+ if ( ! Handler . Properties . Enabled )
98+ return EmptyLayer . Instance ;
99+
99100 var effectLayer = Handler . PostRenderFX ( Handler . Render ( gs ) ) ;
100101 _renderErrors = 0 ;
101102 Error = false ;
0 commit comments