Risenio лет назад: 8
Родитель
Сommit
39cfc1aa63
2 измененных файлов с 9 добавлено и 10 удалено
  1. 8 9
      lib/index.js
  2. 1 1
      manifest.json

+ 8 - 9
lib/index.js

@@ -61,9 +61,8 @@ module.exports = function FpsUtils(mod) {
 			if (!Xdone) {
 			if (!Xdone) {
 				if (Xarray[i].command) Xshove(`<a href='admincommand:/@${Xarray[i].command}'>${Xarray[i].text}</a>`)
 				if (Xarray[i].command) Xshove(`<a href='admincommand:/@${Xarray[i].command}'>${Xarray[i].text}</a>`)
 				else if (!Xarray[i].command) Xshove(`${Xarray[i].text}`)
 				else if (!Xarray[i].command) Xshove(`${Xarray[i].text}`)
-				else console.log(`--v9-ERROR in Fps-Utils, pls report this.`)
-			} else if (Xdone) break;
-			else console.log(`---ERROR in Fps-Utils, pls report this.`)
+				else continue;
+			} else break;
 		}
 		}
 		return Xdata
 		return Xdata
 	}
 	}
@@ -127,12 +126,12 @@ module.exports = function FpsUtils(mod) {
 				TmpData = []
 				TmpData = []
 				TmpData.push(
 				TmpData.push(
 					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br>`, command: `fps gui` },
 					{ text: `<font color="${PurpleClr}" size="+24"><p align="right">MAIN MENU</p></font><br>`, command: `fps gui` },
-					{ text: `<font color="${RedClr}" size="+16">Red</font><font color="${LPurpleClr}" size="+16"> = Shown, <font color="${GreenClr}" size="+16">Green</font><font color="${LPurpleClr}" size="+16"> = Hidden</font></font><br>`, command: `fps gui` },
+					{ text: `<font color="${RedClr}" size="+16">Red</font><font color="${LPurpleClr}" size="+16"> = Shown, <font color="${GreenClr}" size="+16">Green</font><font color="${LPurpleClr}" size="+16"> = Hidden</font></font><br>` },
 					{ text: `<font color="${PinkClr}" size="+16">(Command </font><font color="${HPinkClr}" size="+16">"fps hide &#60;name&#62;"</font><font color="${PinkClr}" size="+16"> to hide someone that does not appear here)</font><br><br>` },
 					{ text: `<font color="${PinkClr}" size="+16">(Command </font><font color="${HPinkClr}" size="+16">"fps hide &#60;name&#62;"</font><font color="${PinkClr}" size="+16"> to hide someone that does not appear here)</font><br><br>` },
-					{ text: `<font color="${LBlueClr}" size="+19">Click on <font color="${RedClr}">Red</font> to hide & add to blacklist. | on <font color="${GreenClr}">Green</font> to show & remove from blacklist</font><br>` }
+					{ text: `<font color="${LBlueClr}" size="+19">Click on <font color="${RedClr}">Red</font> to hide & add to blacklist.<br>Click on <font color="${GreenClr}">Green</font> to show & remove from blacklist</font><br>` }
 				)
 				)
 				for (let i in SpawnedPlayers) {
 				for (let i in SpawnedPlayers) {
-					TmpData.push({ text: `<font color="${mod.settings.PlayersBlacklist.includes(SpawnedPlayers[i].name) ? GreenClr : RedClr}" size="+17">${SpawnedPlayers[i].name}</font>`, command: mod.settings.PlayersBlacklist.includes(SpawnedPlayers[i].name) ? `fps show ${SpawnedPlayers[i].name};fps gui show` : `fps hide  ${SpawnedPlayers[i].name};fps gui show` })
+					TmpData.push({ text: `<font color="${mod.settings.PlayersBlacklist.includes(SpawnedPlayers[i].name) ? GreenClr : RedClr}" size="+17">${SpawnedPlayers[i].name}</font><br>`, command: mod.settings.PlayersBlacklist.includes(SpawnedPlayers[i].name) ? `fps show ${SpawnedPlayers[i].name};fps gui show` : `fps hide  ${SpawnedPlayers[i].name};fps gui show` })
 				}
 				}
 				gui.parse(TmpData, `<font color="${LPurpleClr}">[FPS] Options - Players </font><font color="${RedClr}">(In-distance)</font>`)
 				gui.parse(TmpData, `<font color="${LPurpleClr}">[FPS] Options - Players </font><font color="${RedClr}">(In-distance)</font>`)
 				TmpData = []
 				TmpData = []
@@ -353,8 +352,8 @@ module.exports = function FpsUtils(mod) {
 					{ text: `<font color="${CPinkClr}" size="+17">[Disband]</font><br>`, command: `fps quicklink disband` },
 					{ text: `<font color="${CPinkClr}" size="+17">[Disband]</font><br>`, command: `fps quicklink disband` },
 					{ text: `<font color="${DBlueClr}" size="+21">Extra:</font>&#09;` },
 					{ text: `<font color="${DBlueClr}" size="+21">Extra:</font>&#09;` },
 					{ text: `<font color="${CPinkClr}" size="+17">[Lobby]</font>`, command: `fps quicklink lobby` },
 					{ text: `<font color="${CPinkClr}" size="+17">[Lobby]</font>`, command: `fps quicklink lobby` },
-					{ text: "&#09;&#09;&nbsp;&nbsp;&nbsp;" },
-					{ text: `<font color="${CPinkClr}" size="+17">[!!Instant Exit!!]</font><br>`, command: `fps quicklink instantexit` }
+					{ text: "&#09;&#09;&#09;&#09;&nbsp;" },
+					{ text: `<font color="${HPinkClr}" size="+17">[!! Instant Exit]</font><br>`, command: `fps quicklink instantexit` }
 				], `<font color="${LPurpleClr}">[FPS] Options</font> | <font color="${RedClr}" size="+16">Red</font><font color="${LPurpleClr}" size="+16"> = disabled, <font color="${GreenClr}" size="+16">Green</font><font color="${LPurpleClr}" size="+16"> = enabled</font>`)
 				], `<font color="${LPurpleClr}">[FPS] Options</font> | <font color="${RedClr}" size="+16">Red</font><font color="${LPurpleClr}" size="+16"> = disabled, <font color="${GreenClr}" size="+16">Green</font><font color="${LPurpleClr}" size="+16"> = enabled</font>`)
 		}
 		}
 	}
 	}
@@ -1278,7 +1277,7 @@ module.exports = function FpsUtils(mod) {
 						Msg(`Abnormal id '${arg2}'` + " Removed from the blacklist".clr(RedClr) + '.')
 						Msg(`Abnormal id '${arg2}'` + " Removed from the blacklist".clr(RedClr) + '.')
 						mod.settings.OwnAbnormalsBlacklist = mod.settings.OwnAbnormalsBlacklist.filter(obj => obj != arg2);
 						mod.settings.OwnAbnormalsBlacklist = mod.settings.OwnAbnormalsBlacklist.filter(obj => obj != arg2);
 					} else {
 					} else {
-						Msg(`Abnormal id '${arg2}'` + " Added to the blacklist".clr(GreenClr) + ".")
+						Msg(`Abnormal id '${arg2}'` + " Added to the blacklist".clr(GreenClr) + '.')
 						mod.settings.OwnAbnormalsBlacklist.push(arg2)
 						mod.settings.OwnAbnormalsBlacklist.push(arg2)
 					}
 					}
 					return;
 					return;

+ 1 - 1
manifest.json

@@ -3,7 +3,7 @@
 		"README.md": "1e217dd86a2584c5f6300196e9870288d99c517f1d6ae6c7652d096cc9d034e2",
 		"README.md": "1e217dd86a2584c5f6300196e9870288d99c517f1d6ae6c7652d096cc9d034e2",
 		"lib/data/npcData.json": "df6ea18642a274017e173d9bf34884a44202c72b3e030085aa5bb64f7b2d6337",
 		"lib/data/npcData.json": "df6ea18642a274017e173d9bf34884a44202c72b3e030085aa5bb64f7b2d6337",
 		"lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
 		"lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
-		"lib/index.js": "f41cb7ff5da0186d0afcea65f81c5d6e8201847b0ef9c445cd363efbe09e270a",
+		"lib/index.js": "dbddace2ba4c90886bc6071fd2b0c2c8ec26d8a0eaf0a3a54ce8308b054dcfea",
 		"lib/setting_migration.js": "b31d10274986e26f09643ddbd3b34735e3528065186c7b1d0c9ce49e7bdd4669",
 		"lib/setting_migration.js": "b31d10274986e26f09643ddbd3b34735e3528065186c7b1d0c9ce49e7bdd4669",
 		"module.json": "daad9efa0cb942c279a592e67d01d9d500c99176cbbd3254d27b62b3a6d2096d",
 		"module.json": "daad9efa0cb942c279a592e67d01d9d500c99176cbbd3254d27b62b3a6d2096d",
 		"package.json": "be83cd6f1b534497556ff64feb0d19766c03de3428b63ce11f08908afcc4eafe"
 		"package.json": "be83cd6f1b534497556ff64feb0d19766c03de3428b63ce11f08908afcc4eafe"