Fixed liquid interaction crash

Creating matter blocks and red sand from painted tiles through liquid mixing will no longer cause crashes and corrupted worlds.
sayterdarkwynd · Feb 8, 2025 · bfd2771 · bfd2771
1 parent 765e489
commit bfd2771
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 49 deletions.
diff --git a/tiles/materials/matterblock.material b/tiles/materials/matterblock.material
@@ -1,25 +1,25 @@
-{
-  "materialId" : 174,
-  "materialName" : "matterblock",
-  "particleColor" : [75, 23, 93, 255],
-  "itemDrop" : "matterblock",
-  "description" : "A matter block. A block that matters.",
-  "shortdescription" : "Matter Block",
-  "glitchDescription" : "Fascinated. This appears to be a rare form of raw matter.",
-  "floranDescription" : "Floran musst gather colourful matter crystal.",
-  "novakidDescription" : "Some strange lookin' crystals.",
-  "footstepSound" : "/sfx/blocks/footstep_glass.ogg",
-  "health" : 10,
-  "category" : "materials",
-
-  "renderTemplate" : "/tiles/classicmaterialtemplate.config",
-  "renderParameters" : {
-    "texture" : "matterblock.png",
-    "variants" : 5,
-    "lightTransparent" : false,
-    "occludesBelow" : true,
-    "multiColored" : false,
-    "zLevel" : 1550
-  }//,
- // "learnBlueprintsOnPickup" : [ "matteritem" ]
-}
+{
+  "materialId" : 174,
+  "materialName" : "matterblock",
+  "particleColor" : [75, 23, 93, 255],
+  "itemDrop" : "matterblock",
+  "description" : "A matter block. A block that matters.",
+  "shortdescription" : "Matter Block",
+  "glitchDescription" : "Fascinated. This appears to be a rare form of raw matter.",
+  "floranDescription" : "Floran musst gather colourful matter crystal.",
+  "novakidDescription" : "Some strange lookin' crystals.",
+  "footstepSound" : "/sfx/blocks/footstep_glass.ogg",
+  "health" : 10,
+  "category" : "materials",
+
+  "renderTemplate" : "/tiles/classicmaterialtemplate.config",
+  "renderParameters" : {
+    "texture" : "matterblock.png",
+    "variants" : 5,
+    "lightTransparent" : false,
+    "occludesBelow" : true,
+    "multiColored" : true,
+    "zLevel" : 1550
+  }//,
+ // "learnBlueprintsOnPickup" : [ "matteritem" ]
+}
diff --git a/tiles/materials/redsand2.material b/tiles/materials/redsand2.material
@@ -1,24 +1,24 @@
-{
-  "materialId" : 6617,
-  "materialName" : "redsand2",
-  "particleColor" : [200, 183, 120, 255],
-  "itemDrop" : "redsand2",
-  "description" : "Soft and warm sand.",
-  "shortdescription" : "Red Sand",
-  "glitchDescription" : "Statement. Sand.",
-  "floranDescription" : "Sssand.",
-  "footstepSound" : "/sfx/blocks/footstep_sand2.ogg",
-  "health" : 1,
-  "category": "materials",
-  "soil" : true,
-
-  "renderTemplate" : "/tiles/FullTemplate.config",
-  "renderParameters" : {
-    "texture" : "redsand2.png",
-    "variants" : 3,
-    "lightTransparent" : false,
-    "occludesBelow" : true,
-    "multiColored" : false,
-    "zLevel" : 1830
-  }
-}
+{
+  "materialId" : 6617,
+  "materialName" : "redsand2",
+  "particleColor" : [200, 183, 120, 255],
+  "itemDrop" : "redsand2",
+  "description" : "Soft and warm sand.",
+  "shortdescription" : "Red Sand",
+  "glitchDescription" : "Statement. Sand.",
+  "floranDescription" : "Sssand.",
+  "footstepSound" : "/sfx/blocks/footstep_sand2.ogg",
+  "health" : 1,
+  "category": "materials",
+  "soil" : true,
+
+  "renderTemplate" : "/tiles/FullTemplate.config",
+  "renderParameters" : {
+    "texture" : "redsand2.png",
+    "variants" : 3,
+    "lightTransparent" : false,
+    "occludesBelow" : true,
+    "multiColored" : true,
+    "zLevel" : 1830
+  }
+}