Merge pull request #815 from imring/else

bugfixes
genshinsim · Aug 19, 2022 · 5394250 · 5394250
2 parents bb15ac9 + 8dd4a97
commit 5394250
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/internal/characters/sayu/burst.go b/internal/characters/sayu/burst.go
@@ -109,7 +109,7 @@ func (c *char) createBurstSnapshot() *combat.AttackEvent {
 		ActorIndex: c.Index,
 		Abil:       "Muji-Muji Daruma",
 		AttackTag:  combat.AttackTagElementalBurst,
-		ICDTag:     combat.ICDTagNone,
+		ICDTag:     combat.ICDTagElementalBurst,
 		ICDGroup:   combat.ICDGroupDefault,
 		Element:    attributes.Anemo,
 		Durability: 25,

diff --git a/pkg/gcs/ast/node.go b/pkg/gcs/ast/node.go
@@ -391,12 +391,15 @@ func (i *IfStmt) CopyIfStmt() *IfStmt {
 	if i == nil {
 		return nil
 	}
-	return &IfStmt{
+	n := &IfStmt{
 		Pos:       i.Pos,
 		Condition: i.Condition.CopyExpr(),
 		IfBlock:   i.IfBlock.CopyBlock(),
-		ElseBlock: i.ElseBlock.CopyStmt(),
 	}
+	if i.ElseBlock != nil {
+		n.ElseBlock = i.ElseBlock.CopyStmt()
+	}
+	return n
 }
 
 func (i *IfStmt) CopyStmt() Stmt {