Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix utils.js mergeObjects not checking hasOwnProperty

Browse source
This commit is contained in:
Ryan Huffman 2016-12-05 08:22:15 -08:00
parent fee9dcc981
commit 4766991cae
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
unpublishedScripts/marketplace/bow/utils.js
View file

@ -98,10 +98,14 @@ getEntityCustomData = function(customKey, id, defaultValue) {
mergeObjects = function(proto, custom) {
var result = {};
for (var attrname in proto) {
result[attrname] = proto[attrname];
if (proto.hasOwnProperty(attrname)) {
result[attrname] = proto[attrname];
}
}
for (var attrname in custom) {
result[attrname] = custom[attrname];
if (custom.hasOwnProperty(attrname)) {
result[attrname] = custom[attrname];
}
}
return result;
}