Просмотр исходного кода

Fix.

Fixed the issue where blacklisted users would still spawn even though they're in hidden list.
Risenio лет назад: 7
Родитель
Сommit
2fe55aaac8
2 измененных файлов с 12 добавлено и 9 удалено
  1. 11 8
      lib/index.js
  2. 1 1
      manifest.json

+ 11 - 8
lib/index.js

@@ -375,12 +375,12 @@ module.exports = function FpsUtils(mod) {
 		return name;
 		return name;
 	}
 	}
 
 
-	function HideSpecificPlayer(name) {
+	function HideSpecificPlayerByName(name) {
 		for (let i in SUsers) {
 		for (let i in SUsers) {
 			if (SUsers[i].name.toString().toLowerCase() === name.toLowerCase()) {
 			if (SUsers[i].name.toString().toLowerCase() === name.toLowerCase()) {
 				mod.toClient('S_DESPAWN_USER', 3, { gameId: SUsers[i].gameId, type: 1 });
 				mod.toClient('S_DESPAWN_USER', 3, { gameId: SUsers[i].gameId, type: 1 });
 				HUsers[SUsers[i].gameId] = SUsers[i];
 				HUsers[SUsers[i].gameId] = SUsers[i];
-				return;
+				break;
 			}
 			}
 		}
 		}
 	}
 	}
@@ -392,16 +392,18 @@ module.exports = function FpsUtils(mod) {
 				HNpcs[SNpcs[i].gameId] = SNpcs[i];
 				HNpcs[SNpcs[i].gameId] = SNpcs[i];
 				HNpcs[SNpcs[i].gameId].spawnType = 1;
 				HNpcs[SNpcs[i].gameId].spawnType = 1;
 				HNpcs[SNpcs[i].gameId].spawnScript = 0;
 				HNpcs[SNpcs[i].gameId].spawnScript = 0;
+				break;
 			}
 			}
 		}
 		}
 	}
 	}
 
 
-	function ShowSpecificPlayer(name) {
+	function ShowSpecificPlayerByName(name) {
 		for (let i in HUsers) {
 		for (let i in HUsers) {
 			if (HUsers[i].name.toString().toLowerCase() === name.toLowerCase()) {
 			if (HUsers[i].name.toString().toLowerCase() === name.toLowerCase()) {
 				ModifyUserAppearance(HUsers[i]);
 				ModifyUserAppearance(HUsers[i]);
 				mod.toClient('S_SPAWN_USER', 15, HUsers[i]);
 				mod.toClient('S_SPAWN_USER', 15, HUsers[i]);
 				delete HUsers[i];
 				delete HUsers[i];
+				break;
 			}
 			}
 		}
 		}
 	}
 	}
@@ -411,6 +413,7 @@ module.exports = function FpsUtils(mod) {
 			if (HNpcs[i].huntingZoneId === hz && HNpcs[i].templateId === ti) {
 			if (HNpcs[i].huntingZoneId === hz && HNpcs[i].templateId === ti) {
 				mod.toClient('S_SPAWN_NPC', 11, HNpcs[i]);
 				mod.toClient('S_SPAWN_NPC', 11, HNpcs[i]);
 				delete HNpcs[i];
 				delete HNpcs[i];
+				break;
 			}
 			}
 		}
 		}
 	}
 	}
@@ -782,7 +785,7 @@ module.exports = function FpsUtils(mod) {
 	function sSpawnUser(event) {
 	function sSpawnUser(event) {
 		SUsers[event.gameId] = event;
 		SUsers[event.gameId] = event;
 		SUsers[event.gameId].spawnFx = 1;
 		SUsers[event.gameId].spawnFx = 1;
-		if (mod.settings.Mode === 3 || mod.settings.PlayersBlacklist.includes(event.name) || mod.settings.ClassesData[ClassID(event.templateId)].isHidden || (mod.settings.OnlyParty && !PMembers.includes(event.name))) {
+		if (mod.settings.Mode === 3 || mod.settings.PlayersBlacklist.indexOf(event.name.toLowerCase()) !== -1 || mod.settings.ClassesData[ClassID(event.templateId)].isHidden || (mod.settings.OnlyParty && !PMembers.includes(event.name))) {
 			HUsers[event.gameId] = event;
 			HUsers[event.gameId] = event;
 			HUsers[event.gameId].spawnFx = 1;
 			HUsers[event.gameId].spawnFx = 1;
 			return false;
 			return false;
@@ -1175,7 +1178,7 @@ module.exports = function FpsUtils(mod) {
 									if (mod.settings.ClassesData[i].name === arg) mod.settings.ClassesBlacklist.push(arg);
 									if (mod.settings.ClassesData[i].name === arg) mod.settings.ClassesBlacklist.push(arg);
 									if (mod.settings.ClassesData[i].role.includes(arg)) mod.settings.RolesBlacklist.push(arg);
 									if (mod.settings.ClassesData[i].role.includes(arg)) mod.settings.RolesBlacklist.push(arg);
 									let classtohide = mod.settings.ClassesData[i].model;
 									let classtohide = mod.settings.ClassesData[i].model;
-									for (let i in SUsers) { if (ClassID(SUsers[i].templateId) === classtohide) HideSpecificPlayer(SUsers[i].name); }
+									for (let i in SUsers) { if (ClassID(SUsers[i].templateId) === classtohide) HideSpecificPlayerByName(SUsers[i].name); }
 								}
 								}
 							}
 							}
 							Msg(`Class/Role ${arg} <font color="${GrnC}">Hidden</font>.`);
 							Msg(`Class/Role ${arg} <font color="${GrnC}">Hidden</font>.`);
@@ -1183,13 +1186,13 @@ module.exports = function FpsUtils(mod) {
 						} else if (mod.settings.ClassesBlacklist.includes(arg) || mod.settings.RolesBlacklist.includes(arg)) return Msg(`Class/Role '${arg}' <font color="${RedC}">Already hidden</font>.`);
 						} else if (mod.settings.ClassesBlacklist.includes(arg) || mod.settings.RolesBlacklist.includes(arg)) return Msg(`Class/Role '${arg}' <font color="${RedC}">Already hidden</font>.`);
 					Msg(`Player '${arg}' <font color="${GrnC}">Hidden</font>.`);
 					Msg(`Player '${arg}' <font color="${GrnC}">Hidden</font>.`);
 					mod.settings.PlayersBlacklist.push(arg);
 					mod.settings.PlayersBlacklist.push(arg);
-					HideSpecificPlayer(arg);
+					HideSpecificPlayerByName(arg);
 				} else Msg(`<font color="${GryC}">Invalid ${arg2}</font>.`);
 				} else Msg(`<font color="${GryC}">Invalid ${arg2}</font>.`);
 				break;
 				break;
 			case "show":
 			case "show":
 				if (typeof arg === "string" && arg !== null) {
 				if (typeof arg === "string" && arg !== null) {
 					if (mod.settings.PlayersBlacklist.includes(arg)) {
 					if (mod.settings.PlayersBlacklist.includes(arg)) {
-						ShowSpecificPlayer(arg);
+						ShowSpecificPlayerByName(arg);
 						RemoveEntity(mod.settings.PlayersBlacklist, arg);
 						RemoveEntity(mod.settings.PlayersBlacklist, arg);
 						Msg(`Player '${arg}' <font color="${RedC}">Shown</font>.`);
 						Msg(`Player '${arg}' <font color="${RedC}">Shown</font>.`);
 						return;
 						return;
@@ -1202,7 +1205,7 @@ module.exports = function FpsUtils(mod) {
 								mod.settings.ClassesData[i].isHidden = false;
 								mod.settings.ClassesData[i].isHidden = false;
 								let classToShow = mod.settings.ClassesData[i].model;
 								let classToShow = mod.settings.ClassesData[i].model;
 								for (let i in HUsers) {
 								for (let i in HUsers) {
-									if (ClassID(HUsers[i].templateId) === classToShow) ShowSpecificPlayer(HUsers[i].name);
+									if (ClassID(HUsers[i].templateId) === classToShow) ShowSpecificPlayerByName(HUsers[i].name);
 								}
 								}
 							}
 							}
 						}
 						}

+ 1 - 1
manifest.json

@@ -3,7 +3,7 @@
         "README.md": "bc59f32c10752de9a4123dec9688be45e9e97bd5ef6cd20ecdf249635fafc333",
         "README.md": "bc59f32c10752de9a4123dec9688be45e9e97bd5ef6cd20ecdf249635fafc333",
         "lib/data/npcData.json": "dad0fe8bf2942a36c9a33b324e43fdda9bcc3b411541d31ae9d01be5169bdfb7",
         "lib/data/npcData.json": "dad0fe8bf2942a36c9a33b324e43fdda9bcc3b411541d31ae9d01be5169bdfb7",
         "lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
         "lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
-        "lib/index.js": "fe8e5b85c2c7c402aee60a334de5ce953f41d7156fe8f3e500a4eeb7e47ef066",
+        "lib/index.js": "ae7e029c56d1274a731de8e4f032c0ee8882ebbf39ce48e8b22306bc0d0da3c2",
         "lib/setting_migration.js": "9f0816758b88300afd97ca8aaa8cfc0dadedcdda17713d6e709772a9c0dddcea",
         "lib/setting_migration.js": "9f0816758b88300afd97ca8aaa8cfc0dadedcdda17713d6e709772a9c0dddcea",
         "module.json": "2e105877c06e04aee1225aff0fff699d74cd1c250a975ea0c50f40f8772ea8b9",
         "module.json": "2e105877c06e04aee1225aff0fff699d74cd1c250a975ea0c50f40f8772ea8b9",
         "package.json": "a8aa5a079bc568096b2037f2777f9b01e97ba08ba62a515b7d6908f4bc6e1b51"
         "package.json": "a8aa5a079bc568096b2037f2777f9b01e97ba08ba62a515b7d6908f4bc6e1b51"