Pentagon лет назад: 8
Родитель
Сommit
94e1aba3a0
1 измененных файлов с 20 добавлено и 17 удалено
  1. 20 17
      index.js

+ 20 - 17
index.js

@@ -317,14 +317,14 @@ module.exports = function FpsUtils2(dispatch) {
 
 
 
 
     let spawnedPlayers = {},
     let spawnedPlayers = {},
-            blacklisted = config.blacklistedNames,
             mode = config.mode,
             mode = config.mode,
             myId,
             myId,
             hiddenNpcs = {},
             hiddenNpcs = {},
             hiddenUsers = {};
             hiddenUsers = {};
 // ~~~ * Commands * ~~~
 // ~~~ * Commands * ~~~
 
 
-    command.add('fps', (cmd, arg, arg2) => {
+    command.add('fps', (cmd, a, arg2) => {
+        arg = a.toLowerCase();//easier than replacing everything else
         switch (cmd) {
         switch (cmd) {
             case "mode":
             case "mode":
             case "state":
             case "state":
@@ -367,7 +367,7 @@ module.exports = function FpsUtils2(dispatch) {
                 break
                 break
             case "hide":
             case "hide":
                 if (typeof arg === "string" && arg !== null) {
                 if (typeof arg === "string" && arg !== null) {
-                    if (blacklisted.includes(arg)) {
+                    if (config.blacklistedNames.includes(arg)) {
                         message(`Player "${arg}" already hidden!`);
                         message(`Player "${arg}" already hidden!`);
                         return;
                         return;
                     } else
                     } else
@@ -396,12 +396,12 @@ module.exports = function FpsUtils2(dispatch) {
                         message(`Class/Role "${arg}" already hidden!`);
                         message(`Class/Role "${arg}" already hidden!`);
                         return;
                         return;
                     }
                     }
-                    if (!spawnedPlayers[arg]) {
-                        message(`Player ${arg} not spawned in, hiding anyway!`);
-                    } else {
-                        message(`Player "${arg}" hidden!`);
-                    }
-                    blacklisted.push(arg);
+                    // if (!spawnedPlayers[arg]) {
+                    //   message(`Player ${arg} not spawned in, hiding anyway!`);
+                    // } else {
+                    message(`Player "${arg}" hidden!`);
+                    // }
+                    config.blacklistedNames.push(arg);
                     hidePlayer(arg);
                     hidePlayer(arg);
                     return;
                     return;
                 } else
                 } else
@@ -409,6 +409,13 @@ module.exports = function FpsUtils2(dispatch) {
                 break
                 break
             case "show":
             case "show":
                 if (typeof arg === "string" && arg !== null) {
                 if (typeof arg === "string" && arg !== null) {
+                    if (config.blacklistedNames.includes(arg)) {
+                        showPlayer(arg);
+                        removeName(config.blacklistedNames, arg);
+                        message(`Player "${arg}" shown!`);
+                        saveConfig();
+                        return;
+                    }
                     if ((config.classNames.includes(arg) && config.hiddenClasses.includes(arg)) || (config.hiddenRoles.includes(arg) && config.roleNames.includes(arg))) {
                     if ((config.classNames.includes(arg) && config.hiddenClasses.includes(arg)) || (config.hiddenRoles.includes(arg) && config.roleNames.includes(arg))) {
                         for (let i in config.classes) {
                         for (let i in config.classes) {
                             if (config.classes[i].name === arg || config.classes[i].role.includes(arg)) {//loops are fun, right?
                             if (config.classes[i].name === arg || config.classes[i].role.includes(arg)) {//loops are fun, right?
@@ -434,19 +441,15 @@ module.exports = function FpsUtils2(dispatch) {
                     } else if (!config.hiddenClasses.includes(arg) || !config.hiddenRoles.includes(arg)) {
                     } else if (!config.hiddenClasses.includes(arg) || !config.hiddenRoles.includes(arg)) {
                         message(`Class/Role "${arg}" already displayed!!`);
                         message(`Class/Role "${arg}" already displayed!!`);
                         return;
                         return;
-                    }
-                    if (!blacklisted.includes(arg)) {
+                    } else
+                    if (!config.blacklistedNames.includes(arg)) {
                         message(`Player "${arg}" is not hidden!`);
                         message(`Player "${arg}" is not hidden!`);
                         return;
                         return;
                     }
                     }
-                    showPlayer(arg);
-                    removeName(blacklisted, arg);
-                    message(`Player "${arg}" shown!`);
-                    saveConfig();
                 }
                 }
                 break
                 break
             case "list":
             case "list":
-                message(`Hidden players: ${blacklisted}`);
+                message(`Hidden players: ${config.blacklistedNames}`);
                 message(`Hidden classes: ${config.hiddenClasses}`);
                 message(`Hidden classes: ${config.hiddenClasses}`);
                 message(`Hidden roles: ${config.hiddenRoles}`);
                 message(`Hidden roles: ${config.hiddenRoles}`);
                 break
                 break
@@ -720,7 +723,7 @@ module.exports = function FpsUtils2(dispatch) {
     });
     });
 
 
     dispatch.hook('S_EACH_SKILL_RESULT', 6, (event) => {
     dispatch.hook('S_EACH_SKILL_RESULT', 6, (event) => {
-        if (event.target.equals(myId) || event.owner.equals(myId)) {
+        if (event.source.equals(myId) || event.owner.equals(myId)) {
             if (config.hitMe) {
             if (config.hitMe) {
                 event.skill = '';
                 event.skill = '';
                 return true;
                 return true;