From 88cfb106219c39cf705073669104486ffda873cf Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 7 Feb 2025 20:49:21 -0500
Subject: [PATCH] Fixed #10474

---
 core/src/mindustry/content/TechTree.java       | 1 +
 core/src/mindustry/mod/ContentParser.java      | 1 +
 core/src/mindustry/ui/dialogs/ColorPicker.java | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java
index c4e05638b0..eade391c03 100644
--- a/core/src/mindustry/content/TechTree.java
+++ b/core/src/mindustry/content/TechTree.java
@@ -99,6 +99,7 @@ public class TechTree{
         public TechNode(@Nullable TechNode parent, UnlockableContent content, ItemStack[] requirements){
             if(parent != null){
                 parent.children.add(this);
+                planet = parent.planet;
                 researchCostMultipliers = parent.researchCostMultipliers;
             }else if(researchCostMultipliers == null){
                 researchCostMultipliers = new ObjectFloatMap<>();
diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java
index ec7fa3280b..442348bf2e 100644
--- a/core/src/mindustry/mod/ContentParser.java
+++ b/core/src/mindustry/mod/ContentParser.java
@@ -1224,6 +1224,7 @@ public class ContentParser{
                             }
                             //reparent the node
                             node.parent = parent;
+                            node.planet = parent.planet;
                         }
                     }else{
                         Log.warn(unlock.name + " is not a root node, and does not have a `parent: ` property. Ignoring.");
diff --git a/core/src/mindustry/ui/dialogs/ColorPicker.java b/core/src/mindustry/ui/dialogs/ColorPicker.java
index 8fa0856f4f..f5e096c745 100644
--- a/core/src/mindustry/ui/dialogs/ColorPicker.java
+++ b/core/src/mindustry/ui/dialogs/ColorPicker.java
@@ -132,7 +132,7 @@ public class ColorPicker extends BaseDialog{
 
             hexField = t.field(current.toString(), value -> {
                 try{
-                    current.set(Color.valueOf(value).a(a));
+                    Color.valueOf(current, value);
                     current.toHsv(values);
                     h = values[0];
                     s = values[1];