From 543a0692fe11be820f55a8e0a6198886bd17b49c Mon Sep 17 00:00:00 2001
From: Procyonae <45432782+Procyonae@users.noreply.github.com>
Date: Sat, 30 Nov 2024 12:21:11 +0000
Subject: [PATCH] and is still necessary nvm, also prevents need to change the
 id again

---
 .../vitrification_effect_on_condition.json    | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/data/json/effects_on_condition/nether_eocs/vitrification_effect_on_condition.json b/data/json/effects_on_condition/nether_eocs/vitrification_effect_on_condition.json
index 67e31b03d1a67..e3fbf51607cbb 100644
--- a/data/json/effects_on_condition/nether_eocs/vitrification_effect_on_condition.json
+++ b/data/json/effects_on_condition/nether_eocs/vitrification_effect_on_condition.json
@@ -33,13 +33,18 @@
     "id": "EOC_vitrified_farm_init",
     "condition": {
       "and": [
-        { "not": { "u_has_effect": "VITRIFYING" } },
-        { "not": { "u_has_trait": "NOT_GLASS" } },
-        { "not": { "u_is_on_terrain": "t_quietfarm_border_ground" } },
-        { "not": { "u_is_on_terrain": "t_quietfarm_border_fence" } },
-        { "not": { "u_is_on_terrain": "t_quietfarm_border_fence_closed" } },
-        { "not": { "u_is_on_terrain": "t_quietfarm_border_fence_open" } },
-        { "math": [ "u_vitri_glass_entered < 2" ] }
+        { "or": [ { "u_at_om_location": "unvitrified_farm_0" }, { "u_at_om_location": "unvitrified_orchard" } ] },
+        {
+          "and": [
+            { "not": { "u_has_effect": "VITRIFYING" } },
+            { "not": { "u_has_trait": "NOT_GLASS" } },
+            { "not": { "u_is_on_terrain": "t_quietfarm_border_ground" } },
+            { "not": { "u_is_on_terrain": "t_quietfarm_border_fence" } },
+            { "not": { "u_is_on_terrain": "t_quietfarm_border_fence_closed" } },
+            { "not": { "u_is_on_terrain": "t_quietfarm_border_fence_open" } },
+            { "math": [ "u_vitri_glass_entered < 2" ] }
+          ]
+        }
       ]
     },
     "false_effect": [