From 856a3f478c8e750f51fb4568f50b3c3d871c41a4 Mon Sep 17 00:00:00 2001
From: Jakob Hellermann <jakob.hellermann@protonmail.com>
Date: Sat, 5 Nov 2022 16:43:15 +0000
Subject: [PATCH] make `register` on `TypeRegistry` idempotent (#6487)

# Objective

- adding a new `.register` should not overwrite old type data
- separate crates should both be able to register the same type

I ran into this while debugging why `register::<Handle<T>>` removed the `ReflectHandle` type data from a prior `register_asset_reflect`.


## Solution

- make `register` do nothing if called again for the same type
- I also removed some unnecessary duplicate registrations
---
 crates/bevy_core/src/lib.rs              | 7 ++-----
 crates/bevy_reflect/src/type_registry.rs | 4 ++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/crates/bevy_core/src/lib.rs b/crates/bevy_core/src/lib.rs
index fb22cbc2ab7323..fbc175c1e3f897 100644
--- a/crates/bevy_core/src/lib.rs
+++ b/crates/bevy_core/src/lib.rs
@@ -48,11 +48,6 @@ impl Plugin for CorePlugin {
         );
 
         app.register_type::<Entity>().register_type::<Name>();
-        app.register_type::<Entity>()
-            .register_type::<Name>()
-            .register_type::<Range<f32>>()
-            .register_type_data::<Range<f32>, ReflectSerialize>()
-            .register_type_data::<Range<f32>, ReflectDeserialize>();
 
         register_rust_types(app);
         register_math_types(app);
@@ -63,6 +58,8 @@ impl Plugin for CorePlugin {
 
 fn register_rust_types(app: &mut App) {
     app.register_type::<Range<f32>>()
+        .register_type_data::<Range<f32>, ReflectSerialize>()
+        .register_type_data::<Range<f32>, ReflectDeserialize>()
         .register_type::<String>()
         .register_type::<HashSet<String>>()
         .register_type::<Option<String>>()
diff --git a/crates/bevy_reflect/src/type_registry.rs b/crates/bevy_reflect/src/type_registry.rs
index fe3302774b7616..00f3bdb2f71774 100644
--- a/crates/bevy_reflect/src/type_registry.rs
+++ b/crates/bevy_reflect/src/type_registry.rs
@@ -87,6 +87,10 @@ impl TypeRegistry {
 
     /// Registers the type described by `registration`.
     pub fn add_registration(&mut self, registration: TypeRegistration) {
+        if self.registrations.contains_key(&registration.type_id()) {
+            return;
+        }
+
         let short_name = registration.short_name.to_string();
         if self.short_name_to_id.contains_key(&short_name)
             || self.ambiguous_names.contains(&short_name)