From dd63772bda426479f6a8e309dacf570cfd4e9cc8 Mon Sep 17 00:00:00 2001
From: KPal <48248865+kpal81xd@users.noreply.github.com>
Date: Wed, 26 Feb 2025 13:42:41 +0000
Subject: [PATCH] Grid render component fix (#7384)

* Grid force creation of render component

* Removed addRender call and error if script already has render component

* Replaced throw with console error

* Added return back
---
 scripts/esm/grid.mjs | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/scripts/esm/grid.mjs b/scripts/esm/grid.mjs
index 45eee0ed316..0defb812227 100644
--- a/scripts/esm/grid.mjs
+++ b/scripts/esm/grid.mjs
@@ -137,12 +137,6 @@ class Grid extends Script {
      */
     static RESOLUTION_HIGH = 2;
 
-    /**
-     * @type {boolean}
-     * @private
-     */
-    _addedRender = false;
-
     /**
      * @type {ShaderMaterial}
      * @private
@@ -180,15 +174,17 @@ class Grid extends Script {
     _resolution = Grid.RESOLUTION_HIGH;
 
     initialize() {
-
-        // ensure the entity has a render component
-        if (!this.entity.render) {
-            this.entity.addComponent('render', {
-                castShadows: false
-            });
-            this._addedRender = true;
+        // check if the entity already has a render component
+        if (this.entity.render) {
+            console.error('The entity already has a render component.');
+            return;
         }
 
+        // create render component
+        this.entity.addComponent('render', {
+            castShadows: false
+        });
+
         // create shader material
         this._material = new ShaderMaterial({
             uniqueName: 'grid-shader',
@@ -254,7 +250,6 @@ class Grid extends Script {
      * @private
      */
     _set(name, value) {
-
         if (!this._material) {
             return;
         }
@@ -331,11 +326,7 @@ class Grid extends Script {
     }
 
     destroy() {
-        this.entity.render.meshInstances = [];
-
-        if (this._addedRender) {
-            this.entity.removeComponent('render');
-        }
+        this.entity.removeComponent('render');
     }
 }