Merge branch 'master' into 'release'

Added fixes for trident and bite spell type

See merge request Isleward/isleward!636

src/server/fixes/fixes.js

@@ -183,7 +183,13 @@ module.exports = {
 			});
 
 		items
-			.filter(i => i.name === 'Princess Morgawsa\'s Trident' && i.type !== 'Trident')
+			.filter(i =>
+				i.name === 'Princess Morgawsa\'s Trident' &&
+				(
+					i.type !== 'Trident' ||
+					i.spell.type !== 'projectile'
+				)
+			)
 			.forEach(i => {
 				i.type = 'Trident';
 				i.requires[0].stat = 'int';
@@ -198,7 +204,13 @@ module.exports = {
 			});
 
 		items
-			.filter(i => i.name === 'Steelclaw\'s Bite' && i.type !== 'Curved Dagger')
+			.filter(i =>
+				i.name === 'Steelclaw\'s Bite' &&
+				(
+					i.type !== 'Curved Dagger' ||
+					i.spell.type !== 'melee'
+				)
+			)
 			.forEach(i => {
 				i.type = 'Curved Dagger';
 				i.requires[0].stat = 'dex';