Browse Source

I fucking hate this mod

I fucking hate this mod
Pentagon 8 years ago
parent
commit
2dd2bf5a29
3 changed files with 19 additions and 17 deletions
  1. 15 13
      index.js
  2. 2 2
      manifest.json
  3. 2 2
      module.json

+ 15 - 13
index.js

@@ -118,8 +118,8 @@ module.exports = function FpsUtils(dispatch) {
 	catch(e) {
         console.log('(FPS Utils) - No config file detected, creating...')
         flags = {
-			"version": 1.01,
-			"state": 1,
+			"version": 1.02,
+			"state": 0,
 			"hide": {
 				"tanks": false,
 				"dps": false,
@@ -155,10 +155,11 @@ module.exports = function FpsUtils(dispatch) {
 		};
         saveConfig();
     }
-    if (flags.version !== 1.01){		//Remember to change version number for updates (if new version is 1.1, change to 1.1!)
+    if (flags.version !== 1.02){		//Remember to change version number for updates (if new version is 1.1, change to 1.1!)
         console.log('[FPS Utils] Outdated config file detected, updating...');
         Object.assign(flags,{
-            "version": 1.01,
+            "version": 1.02,
+            "state": 0,
             "hit": false,
             "tc": false,
             "tcp": false,
@@ -178,7 +179,7 @@ module.exports = function FpsUtils(dispatch) {
         counter = 0,
         dur,
         laststate,
-		summonid = [],
+        summonid = [],
         locx = [],
         locy = [],
         state = flags.state,
@@ -373,7 +374,7 @@ module.exports = function FpsUtils(dispatch) {
                         if (hiddenIndividual[pl].name.toLowerCase() === value.toLowerCase()) {
                             command.message(`Showing player ${hiddenIndividual[pl].name}.`)
                             flags.hiddenPeople.splice(flags.hiddenPeople.indexOf(hiddenPlayers[pl].name), 1)
-                            dispatch.toClient('S_SPAWN_USER',11, hiddenIndividual[pl])
+                            dispatch.toClient('S_SPAWN_USER',[328427, 328305].includes(dispatch.base.protocolVersion) ? 12 : 11, hiddenIndividual[pl])
                             delete hiddenIndividual[pl]
                         }
 						return
@@ -386,7 +387,7 @@ module.exports = function FpsUtils(dispatch) {
                     for (let pl in hiddenPlayers) {
 						if (classes[value].indexOf(getClass(hiddenPlayers[pl].templateId)) > -1 && !hiddenIndividual[hiddenPlayers[pl].gameId]) {
                             delete peopleThatAreActuallyHidden[hiddenPlayers[pl].gameId]
-                            dispatch.toClient('S_SPAWN_USER',11, hiddenPlayers[pl])
+                            dispatch.toClient('S_SPAWN_USER',[328427, 328305].includes(dispatch.base.protocolVersion) ? 12 : 11, hiddenPlayers[pl])
                         }
 					}
                 }
@@ -457,8 +458,7 @@ module.exports = function FpsUtils(dispatch) {
         peopleThatAreActuallyHidden = {}
     })
 
-    dispatch.hook('S_SPAWN_USER', 11, (event) => {
-
+    dispatch.hook('S_SPAWN_USER', [328427, 328305].includes(dispatch.base.protocolVersion) ? 12 : 11, (event) => {
         // Add players in proximity of user to possible hide list.
         hiddenPlayers[event.gameId] = event
 
@@ -569,7 +569,6 @@ module.exports = function FpsUtils(dispatch) {
 		if (flags.blockEffect) {
 			if (!event.source.equals(pcid) && db.hiddeneffect.includes(event.id)) return false
 		}
-
     })
 
     dispatch.hook('S_PARTY_MEMBER_ABNORMAL_ADD',3, {order: 999}, (event) => {
@@ -601,10 +600,13 @@ module.exports = function FpsUtils(dispatch) {
     dispatch.hook('S_USER_LOCATION',1,(event) => {
         if(hiddenPlayers[event.target] === undefined) return
         // Update locations of every player in case we need to spawn them.
+        if (dispatch.base.protocolVersion === 328305 ||dispatch.base.protocolVersion === 328427){
+        hiddenPlayers[event.target].loc.x = event.x2
+        hiddenPlayers[event.target].loc.y = event.y2} else
+    {
         hiddenPlayers[event.target].x = event.x2
         hiddenPlayers[event.target].y = event.y2
-        hiddenPlayers[event.target].z = event.z2
-        hiddenPlayers[event.target].w = event.w
+    }
         if (state > 2 || hiddenIndividual[event.target]) return false
 
     })
@@ -691,7 +693,7 @@ module.exports = function FpsUtils(dispatch) {
 	function redisplay() {
 		for (let pl in hiddenPlayers) {
 			if(!hiddenIndividual[hiddenPlayers[pl].gameId]) {
-				dispatch.toClient('S_SPAWN_USER',11, hiddenPlayers[pl])
+				dispatch.toClient('S_SPAWN_USER',[328427, 328305].includes(dispatch.base.protocolVersion) ? 12 : 11, hiddenPlayers[pl])
 			}
 		}
 

+ 2 - 2
manifest.json

@@ -1,12 +1,12 @@
 {
   "files": {
-    "index.js": "A3665989412F924174429428316E082827E2D374AC8D6B7E628A62FBF84F566B",
+    "index.js": "AB58D49F812E0D78E40E207962911352F448FBE85ABBC421624CE19BA536E6AC",
     "module.json": "cfeb11cee659e5bdbbef0332226edc4761ebd62f6f8a4b870652fa4cfeff7669",
     "README.md": "B90C722B16F6967F32CB6DDE086FE58491EE6F5184D72DB27938A2B6FA79FAD4",
     "package.json": "6d41e903c6db29adb13141a750e35991fcf8cef9831f47da6f3e7b25ce2e8be3"
   },
   "defs": {
-    "S_SPAWN_USER": 11,
+    "S_SPAWN_USER": [11, 12],
     "S_DESPAWN_USER": 3,
     "S_LOGIN": 2,
     "S_LOAD_TOPO": 2,

+ 2 - 2
module.json

@@ -1,4 +1,4 @@
 {
-    "servers": ["https://raw.githubusercontent.com/hugedong69/fps-utils/master/"],
+    "servers": ["https://raw.githubusercontent.com/codeagon/fps-utils/master/"],
     "supportUrl": "https://discord.gg/maqBmJV"
-}
+}