diff --git a/common/src/generated/resources/data/cobblemon/cobblemon/elemental_type/ground.json b/common/src/generated/resources/data/cobblemon/cobblemon/elemental_type/ground.json
index 0b86fbca49..ecdde5bbb3 100644
--- a/common/src/generated/resources/data/cobblemon/cobblemon/elemental_type/ground.json
+++ b/common/src/generated/resources/data/cobblemon/cobblemon/elemental_type/ground.json
@@ -42,6 +42,13 @@
         "typeId": "cobblemon:water"
       },
       "resistance": "SUPER_EFFECTIVE"
+    },
+    {
+      "effect": {
+        "type": "cobblemon:showdown_condition",
+        "conditionId": "sandstorm"
+      },
+      "resistance": "IMMUNE"
     }
   ],
   "displayName": {
diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/resistance/ResistanceTable.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/resistance/ResistanceMap.kt
similarity index 83%
rename from common/src/main/kotlin/com/cobblemon/mod/common/api/resistance/ResistanceTable.kt
rename to common/src/main/kotlin/com/cobblemon/mod/common/api/resistance/ResistanceMap.kt
index bc397d6c93..3cd899fcbc 100644
--- a/common/src/main/kotlin/com/cobblemon/mod/common/api/resistance/ResistanceTable.kt
+++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/resistance/ResistanceMap.kt
@@ -43,6 +43,12 @@ class ResistanceMap(private val map: Map<Effect, Resistance>) : Map<Effect, Resi
         val CODEC: Codec<ResistanceMap> = Codec.list(ENTRY_CODEC)
             .comapFlatMap(
                 { list ->
+                    val presentEffects = hashSetOf<Effect>()
+                    list.forEach {
+                        if (!presentEffects.add(it.first)) {
+                            return@comapFlatMap DataResult.error { "Duplicate effect in ResistanceMap, this is impossible" }
+                        }
+                    }
                     DataResult.success(ResistanceMap(list.associate { it.first to it.second }))
                 },
                 { it.entries.map { entry -> Pair(entry.key, entry.value) } }
diff --git a/fabric/src/main/kotlin/com/cobblemon/mod/fabric/data/CobblemonFabricDataGeneratorEntrypoint.kt b/fabric/src/main/kotlin/com/cobblemon/mod/fabric/data/CobblemonFabricDataGeneratorEntrypoint.kt
index 2b88539a4c..6479fc5e6c 100644
--- a/fabric/src/main/kotlin/com/cobblemon/mod/fabric/data/CobblemonFabricDataGeneratorEntrypoint.kt
+++ b/fabric/src/main/kotlin/com/cobblemon/mod/fabric/data/CobblemonFabricDataGeneratorEntrypoint.kt
@@ -21,7 +21,7 @@ class CobblemonFabricDataGeneratorEntrypoint : DataGeneratorEntrypoint {
 
     private fun commonDataGen(pack: FabricDataGenerator.Pack) {
         pack.addProvider { output, registries -> ElementalTypeProvider(output, registries) }
-        //pack.addProvider { output, registries -> TeraTypeProvider(output, registries) }
+        pack.addProvider { output, registries -> TeraTypeProvider(output, registries) }
     }
 
 }
\ No newline at end of file