incremental-social/The-Modding-Tree
incremental-social/The-Modding-Tree
Template
1
0
Fork 0
mirror of https://github.com/Acamaeda/The-Modding-Tree.git synced 2025-05-01 05:51:07 +00:00
Code Issues Releases Activity Actions

Merge branch '2.3.6-dev' into 2.3.6-dev

Browse source
This commit is contained in:
Harley White 2021-01-24 19:14:00 -05:00 • committed by GitHub
commit cf69924b5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 48 additions and 29 deletions

3
js/utils.js
View file

@ -211,7 +211,8 @@ function goBack() {
function layOver(obj1, obj2) {
for (let x in obj2) {
if (obj2[x] instanceof Object) layOver(obj1[x], obj2[x]);
if (obj2[x] instanceof Decimal) obj1[x] = new Decimal(obj2[x])
else if (obj2[x] instanceof Object) layOver(obj1[x], obj2[x]);
else obj1[x] = obj2[x];
}
}