Browse Source

Fix.

Fixed the issue where hiding blacklisted skills were not working as intended.
Also do not hide non-owned items even if blacklisted.
Mie 7 years ago
parent
commit
9c8a9a97e2
2 changed files with 3 additions and 5 deletions
  1. 2 4
      lib/index.js
  2. 1 1
      manifest.json

+ 2 - 4
lib/index.js

@@ -886,7 +886,7 @@ module.exports = function FpsUtils(mod) {
 
 	function sActionStage(event) {
 		if (EqGid(event.gameId) || !SUsers[event.gameId]) return;
-		if ((mod.settings.Mode >= 2) || HUsers[event.gameId] || (mod.settings.HideBlacklistedSkills && mod.settings.ClassesData[ClassID(event.templateId)].CD_SkillsBlacklist.includes(Math.floor((event.skill.id / 10000).toString()))) || mod.settings.ClassesData[ClassID(event.templateId)].CD_HideBlacklistedSkills) {
+		if ((mod.settings.Mode >= 2) || HUsers[event.gameId] || mod.settings.ClassesData[ClassID(event.templateId)].CD_HideBlacklistedSkills || (mod.settings.HideBlacklistedSkills && mod.settings.ClassesData[ClassID(event.templateId)].CD_SkillsBlacklist.includes(Math.floor(event.skill.id / 10000).toString()))) {
 			UpdateUserLoc(event);
 			return false;
 		}
@@ -936,9 +936,7 @@ module.exports = function FpsUtils(mod) {
 	function sSpawnDropItem(event) {
 		if (EqGid(event.source)) return;
 		if (mod.settings.HideBlacklistedDrop) {
-			for (let i in event.owners) {
-				if (event.owners[i].playerId.toString() === MyPlayerId.toString()) return;
-			}
+			for (const p in event.owners) if ((event.owners[p].playerId.toString() === MyPlayerId.toString()) || event.owners.length === 0) return;
 			if (mod.settings.DropBlacklist.includes(event.item)) return false;
 		}
 		if (mod.settings.Mode >= 2) {

+ 1 - 1
manifest.json

@@ -3,7 +3,7 @@
         "README.md": "d460498a2503b6857f0faed356b8f06cf4108ae863d022e361f6762877966837",
         "lib/data/npcData.json": "913aace2b007dc2c04cfcb4b96bd8fea4abbc4a149df8a901c7382797b25f23b",
         "lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
-        "lib/index.js": "90c18a34af941478bb029a77c1d98868a0471a95a653c38f7e820169615b298f",
+        "lib/index.js": "3a1ecb8718ac5d9739c98d85af4d42d1fa4965a76936b2cb78f11abc38e7c655",
         "lib/setting_migration.js": "868abf1f54c8e91df415e19220a2046021fa67a905dcff6a799b01a83488f6a8",
         "module.json": "edcfd2361bc0f72ed7b3838f9f07ad3647738ed2564e230e7da8f7b4a08db715",
         "package.json": "f3e3cf2c845e54b6503108b6bef7f8f5bf33654f6ae1664c75bedbf7f6aa83c1"