SaltyMonkey лет назад: 6
Родитель
Сommit
5311f175c6
2 измененных файлов с 11 добавлено и 30 удалено
  1. 2 1
      fpsManager.js
  2. 9 29
      lib/unitFps.js

+ 2 - 1
fpsManager.js

@@ -49,7 +49,8 @@ class FpsManager {
 			mod.error(msg.runtimeOld);
 			mod.error(msg.runtimeOld);
 
 
 		mod.game.initialize("me");
 		mod.game.initialize("me");
-
+		mod.game.initialize("party");
+		
 		units.forEach(unit => {
 		units.forEach(unit => {
 			// eslint-disable-next-line no-magic-numbers
 			// eslint-disable-next-line no-magic-numbers
 			deps[unit[0]] = new unit[1](deps);
 			deps[unit[0]] = new unit[1](deps);

+ 9 - 29
lib/unitFps.js

@@ -34,7 +34,7 @@ class unitFps {
 		const blockedDrop = new Set();
 		const blockedDrop = new Set();
 		const blockedBuildObjects = new Set();
 		const blockedBuildObjects = new Set();
 
 
-		const partyMembers = new Map();
+		let partyMembers = new Map();
 
 
 		const blockedProjectiles = new Set();
 		const blockedProjectiles = new Set();
 
 
@@ -609,30 +609,6 @@ class unitFps {
 			if (isActionScriptBlockable(event)) return false;
 			if (isActionScriptBlockable(event)) return false;
 		};
 		};
 
 
-		const partyMemberListHandler = (event) => {
-			partyMembers.clear();
-			event.members.forEach(member => {
-				if (!isMe(member.gameId))
-					partyMembers.set(member.gameId, { "pid": member.playerId, "sid": member.serverId });
-			});
-			reconfigurePlayers();
-		};
-
-		const partyMemberDeleteHandler = (event) => {
-			[...partyMembers.keys()].forEach(key => {
-				let value = partyMembers.get(key);
-				if (value["pid"] === event.playerId && value["sid"] === event.serverId) {
-					partyMembers.delete(key);
-				}
-			});
-			reconfigurePlayers();
-		};
-
-		const partyLeaveHandler = () => {
-			partyMembers.clear();
-			reconfigurePlayers();
-		};
-
 		const cleanup = () => {
 		const cleanup = () => {
 			blockedPlayers.clear();
 			blockedPlayers.clear();
 			blockedNpcs.clear();
 			blockedNpcs.clear();
@@ -723,10 +699,14 @@ class unitFps {
 		mod.hook(...proto.getData("S_UNICAST_TRANSFORM_DATA"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
 		mod.hook(...proto.getData("S_UNICAST_TRANSFORM_DATA"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
 		mod.hook(...proto.getData("S_USER_CHANGE_FACE_CUSTOM"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
 		mod.hook(...proto.getData("S_USER_CHANGE_FACE_CUSTOM"), HOOK_SETTINGS.LAST, appearanceChangeHandler);
 
 
-		mod.hook(...proto.getData("S_PARTY_MEMBER_LIST"), HOOK_SETTINGS.FIRSTA, partyMemberListHandler);
-		mod.hook(...proto.getData("S_LEAVE_PARTY_MEMBER"), HOOK_SETTINGS.FIRSTA, partyMemberDeleteHandler);
-		mod.hook(...proto.getData("S_BAN_PARTY_MEMBER"), HOOK_SETTINGS.FIRSTA, partyMemberDeleteHandler);
-		mod.hook("S_LEAVE_PARTY", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.FIRSTA, partyLeaveHandler);
+		mod.game.party.on("list", (list) => {
+			partyMembers.clear();
+			partyMembers = new Set(list.map(x => x.gameId));
+		});
+
+		mod.game.party.on("leave", () => {
+			partyMembers.clear();
+		});
 
 
 		deps.data.on(EVENTS.RECONFIGURE, () => {
 		deps.data.on(EVENTS.RECONFIGURE, () => {
 			changeShakeState();
 			changeShakeState();