Merge branch 'master' into 'release'

Master

See merge request Isleward/isleward!617

src/server/components/inventory/dropBag.js

@@ -51,7 +51,7 @@ module.exports = (cpnInv, ownerName, killSource) => {
 				noCurrency: i > 0
 			};
 
-			let useItem = generator.generate(itemBlueprint, playerObject.stats.values.level);
+			const useItem = generator.generate(itemBlueprint, playerObject.stats.values.level);
 			cpnInv.getItem(useItem);
 		}
 	}
@@ -70,7 +70,7 @@ module.exports = (cpnInv, ownerName, killSource) => {
 
 			let item = drop;
 			if ((!item.quest) && (item.type !== 'key'))
-				item = generator.generate(drop);
+				item = generator.generate(extend({}, drop));
 
 			if (!item.slot)
 				delete item.level;

src/server/items/generators/types.js

@@ -10,7 +10,7 @@ module.exports = {
 			const types = configTypes.types[item.slot];
 			const typeArray = Object
 				.entries(types)
-				.filter(t => t.noDrop !== true);
+				.filter(t => t[1].noDrop !== true);
 
 			const materials = Object.values(types)
 				.map(t => {
@@ -26,7 +26,7 @@ module.exports = {
 				.forEach(t => {
 					const [ typeName, typeConfig ] = t;
 
-					if (typeConfig.material === material)
+					if (typeConfig.material === material && typeConfig.noDrop !== true)
 						possibleTypes[typeName] = typeConfig;
 				});