Don't remove metatable in adapter to make re-registering more stable

ark120202 · ark120202 · commit 0d2ed202f8cf · 2020-08-25T21:49:54.000+05:00
diff --git a/game/scripts/vscripts/lib/dota_ts_adapter.ts b/game/scripts/vscripts/lib/dota_ts_adapter.ts
@@ -109,10 +109,6 @@ function clearTable(table: object) {
     for (const key in table) {
         delete (table as any)[key];
     }
-
-    // Remove metatable added by ExtendInstance
-    // https://github.com/SteamDatabase/GameTracking-Dota2/blob/7edcaa294bdcf493df0846f8bbcd4d47a5c3bd57/game/core/scripts/vscripts/init.lua#L195
-    setmetatable(table, undefined);
 }
 
 function getFileScope(): [any, string] {
@@ -131,7 +127,9 @@ function toDotaClassInstance(instance: any, table: new () => any) {
     let { prototype } = table;
     while (prototype) {
         for (const key in prototype) {
-            if (instance[key] == null) {
+            // Using hasOwnProperty to ignore methods from metatable added by ExtendInstance
+            // https://github.com/SteamDatabase/GameTracking-Dota2/blob/7edcaa294bdcf493df0846f8bbcd4d47a5c3bd57/game/core/scripts/vscripts/init.lua#L195
+            if (!instance.hasOwnProperty(key)) {
                 instance[key] = prototype[key];
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -109,10 +109,6 @@ function clearTable(table: object) {`
`109`	`109`	`for (const key in table) {`
`110`	`110`	`delete (table as any)[key];`
`111`	`111`	`}`
`112`		`-`
`113`		`- // Remove metatable added by ExtendInstance`
`114`		`- // https://github.com/SteamDatabase/GameTracking-Dota2/blob/7edcaa294bdcf493df0846f8bbcd4d47a5c3bd57/game/core/scripts/vscripts/init.lua#L195`
`115`		`- setmetatable(table, undefined);`
`116`	`112`	`}`
`117`	`113`
`118`	`114`	`function getFileScope(): [any, string] {`
`@@ -131,7 +127,9 @@ function toDotaClassInstance(instance: any, table: new () => any) {`
`131`	`127`	`let { prototype } = table;`
`132`	`128`	`while (prototype) {`
`133`	`129`	`for (const key in prototype) {`
`134`		`- if (instance[key] == null) {`
	`130`	`+ // Using hasOwnProperty to ignore methods from metatable added by ExtendInstance`
	`131`	`+ // https://github.com/SteamDatabase/GameTracking-Dota2/blob/7edcaa294bdcf493df0846f8bbcd4d47a5c3bd57/game/core/scripts/vscripts/init.lua#L195`
	`132`	`+ if (!instance.hasOwnProperty(key)) {`
`135`	`133`	`instance[key] = prototype[key];`
`136`	`134`	`}`
`137`	`135`	`}`