Tag try catch and bump version

Mattshark89 · May 13, 2024 · 85f882b · 85f882b
1 parent 64d629f
commit 85f882b
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 17 deletions.
diff --git a/Assets/SerializedUdonPrograms/9dc17e2102f14574e921629b752391f4.asset b/Assets/SerializedUdonPrograms/9dc17e2102f14574e921629b752391f4.asset
diff --git a/Assets/UdonSharp/Settings.meta b/Assets/UdonSharp/Settings.meta
diff --git a/Packages/com.mattshark.openflight/Editor/TagNotifier.cs b/Packages/com.mattshark.openflight/Editor/TagNotifier.cs
@@ -163,14 +163,21 @@ private static int getTagCount()
         [MenuItem("VRC Packages/OpenFlight/Add OpenFlight Tag")]
         private static async Task runAutoTag()
         {
-            //exit if they have opted out
-            if (getProjectTagDecision())
+            try
             {
-                return;
-            }
+                //exit if they have opted out
+                if (getProjectTagDecision())
+                {
+                    return;
+                }
 
-            await GetWorld();
-            addTag("openflight");
+                await GetWorld();
+                addTag("openflight");
+            }
+            catch (Exception e)
+            {
+                Debug.LogWarning("OpenFlight: Error automatically adding OpenFlight tag. This is not a critical error, but you may want to add the tag manually. Error: " + e.Message);
+            }
         }
 
         //button to reset opt out decision

diff --git a/Packages/com.mattshark.openflight/Editor/UI Styler.meta b/Packages/com.mattshark.openflight/Editor/UI Styler.meta
diff --git a/Packages/com.mattshark.openflight/Runtime/Development Scene.unity b/Packages/com.mattshark.openflight/Runtime/Development Scene.unity
@@ -21558,7 +21558,7 @@ PrefabInstance:
         type: 3}
       propertyPath: DynamicMaterials.Array.data[1]
       value: 
-      objectReference: {fileID: 2100000, guid: aabb29aed4263394fb007e1929862c35, type: 2}
+      objectReference: {fileID: 2100000, guid: 0923c77949c327045b5f8e90603d8950, type: 2}
     - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d,
         type: 3}
       propertyPath: DynamicMaterials.Array.data[2]
@@ -21568,12 +21568,12 @@ PrefabInstance:
         type: 3}
       propertyPath: DynamicMaterials.Array.data[3]
       value: 
-      objectReference: {fileID: 2100000, guid: c2ccc285a7ce18c4c9f486b4bd981b7d, type: 2}
+      objectReference: {fileID: 2100000, guid: aabb29aed4263394fb007e1929862c35, type: 2}
     - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d,
         type: 3}
       propertyPath: DynamicMaterials.Array.data[4]
       value: 
-      objectReference: {fileID: 2100000, guid: 0923c77949c327045b5f8e90603d8950, type: 2}
+      objectReference: {fileID: 2100000, guid: c2ccc285a7ce18c4c9f486b4bd981b7d, type: 2}
     - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d,
         type: 3}
       propertyPath: DynamicMaterials.Array.data[5]

diff --git a/Packages/com.mattshark.openflight/package.json b/Packages/com.mattshark.openflight/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.mattshark.openflight",
   "displayName": "OpenFlight",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "description": "A VRChat flight system that allow all kinds of avatars to fly. https://github.com/Mattshark89/OpenFlight-VRC",
   "bugs" : {
     "url" : "https://github.com/Mattshark89/OpenFlight-VRC/issues"

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -1,11 +1,5 @@
 {
   "dependencies": {
-    "com.cyan.playerobjectpool": {
-      "version": "file:com.cyan.playerobjectpool",
-      "depth": 0,
-      "source": "embedded",
-      "dependencies": {}
-    },
     "com.mattshark.openflight": {
       "version": "file:com.mattshark.openflight",
       "depth": 0,