Browse Source

Debug step 1

SaltyMonkey 6 years ago
parent
commit
80a7edbe77
2 changed files with 13 additions and 8 deletions
  1. 5 6
      lib/unitFps.js
  2. 8 2
      lib/unitTracker.js

+ 5 - 6
lib/unitFps.js

@@ -338,7 +338,7 @@ class unitFps {
 		//-------------------------------------
 
 		//Simple basic hooks
-		data.throttlePacketsData.forEach(packet => { mod.hook(packet, RAW_HOOK_MODE.PAYLOAD, HOOK_SETTINGS.LAST, throttlePacketsHandler); });
+		data.throttlePacketsData.forEach(packet => { mod.hook(packet, RAW_HOOK_MODE.PAYLOAD, HOOK_SETTINGS.LAST, throttlePacketsHandler.bind(null, packet)); });
 		data.lockedPacketsData.forEach(packet => { mod.hook(packet, RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, blockUselessPacketsHandler); });
 
 		mod.hook(...proto.getData("S_SYSTEM_MESSAGE"), HOOK_SETTINGS.LAST, smtHandler);
@@ -370,7 +370,6 @@ class unitFps {
 		// Cleanup hooks for hidden entities
 		//-------------------------------------
 		mod.hook(...proto.getData("S_SOCIAL"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
-		//mod.hook(...proto.getData("S_SOCIAL_CANCEL"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
 		mod.hook(...proto.getData("S_USER_STATUS"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
 		mod.hook(...proto.getData("S_USER_MOVETYPE"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
 		mod.hook(...proto.getData("S_FEARMOVE_STAGE"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
@@ -461,7 +460,7 @@ class unitFps {
 				}
 				else if (!needBlock && blockedServants.has(key)) {
 					mod.send(...proto.getData("S_REQUEST_SPAWN_SERVANT"), value);
-					blockedServants.remove(key);
+					blockedServants.delete(key);
 				}
 			}
 
@@ -473,19 +472,19 @@ class unitFps {
 				}
 				else if (!needBlock && blockedSummons.has(key)) {
 					mod.send(...proto.getData("S_SPAWN_NPC"), value);
-					blockedSummons.remove(key);
+					blockedSummons.delete(key);
 				}
 			}
 
 			for (const [key, value] of tracker.spawnedNPCS.entries()) {
-				let needBlock = isSummonsBlockable(value);
+				let needBlock = isNpcBlockable(value);
 				if (needBlock && !blockedNpcs.has(key)) {
 					mod.send(...proto.getData("S_DESPAWN_NPC"), { "gameId": value.gameId, "type": DESPAWN_TYPES.OUTOFVIEW, "loc": value.loc });
 					blockedNpcs.add(key);
 				}
 				else if (!needBlock && blockedNpcs.has(key)) {
 					mod.send(...proto.getData("S_SPAWN_NPC"), value);
-					blockedNpcs.remove(key);
+					blockedNpcs.delete(key);
 				}
 			}
 		});

+ 8 - 2
lib/unitTracker.js

@@ -101,9 +101,15 @@ class unitTracker {
 			}
 		};
 
-		const updateAngle = (data, w) => data.loc.w = w;
+		const updateAngle = (data, w) => {
+			data.loc.w = w;
+			return data;
+		};
 
-		const updateLoc = (data, loc) => data.loc = loc;
+		const updateLoc = (data, loc) => {
+			data.loc = loc;
+			return data;
+		};
 
 		const updateAngleHandler = (event) => {
 			let gameId = event.gameId;