|
@@ -27,7 +27,6 @@ class unitFps {
|
|
|
|
|
|
|
|
let throttledDAta = {};
|
|
let throttledDAta = {};
|
|
|
|
|
|
|
|
- const blockedCollections = new Set();
|
|
|
|
|
const blockedPlayers = new Set();
|
|
const blockedPlayers = new Set();
|
|
|
const blockedNpcs = new Set();
|
|
const blockedNpcs = new Set();
|
|
|
const blockedSummons = new Set();
|
|
const blockedSummons = new Set();
|
|
@@ -68,14 +67,13 @@ class unitFps {
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
|
|
+ // eslint-disable-next-line no-unused-vars
|
|
|
const collectionHandler = (type, event) => {
|
|
const collectionHandler = (type, event) => {
|
|
|
switch (type) {
|
|
switch (type) {
|
|
|
case (ENTITY_HOOK_TYPE.DESPAWN):
|
|
case (ENTITY_HOOK_TYPE.DESPAWN):
|
|
|
- blockedCollections.delete(event.gameId);
|
|
|
|
|
break;
|
|
break;
|
|
|
case (ENTITY_HOOK_TYPE.SPAWN):
|
|
case (ENTITY_HOOK_TYPE.SPAWN):
|
|
|
if (data.activeMode.blockCollections) {
|
|
if (data.activeMode.blockCollections) {
|
|
|
- blockedCollections.add(event.gameId);
|
|
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -273,7 +271,6 @@ class unitFps {
|
|
|
const blockAchievementsInCombat = () => ((data.activeMode.blockAchievementSpamInCombat && meInCombat()) ? false : undefined);
|
|
const blockAchievementsInCombat = () => ((data.activeMode.blockAchievementSpamInCombat && meInCombat()) ? false : undefined);
|
|
|
|
|
|
|
|
const cleanup = () => {
|
|
const cleanup = () => {
|
|
|
- blockedCollections.clear();
|
|
|
|
|
blockedPlayers.clear();
|
|
blockedPlayers.clear();
|
|
|
blockedNpcs.clear();
|
|
blockedNpcs.clear();
|
|
|
blockedSummons.clear();
|
|
blockedSummons.clear();
|
|
@@ -290,7 +287,7 @@ class unitFps {
|
|
|
data.lockedPacketsData.forEach(packet => { mod.hook(packet, RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, blockUselessPackets); });
|
|
data.lockedPacketsData.forEach(packet => { mod.hook(packet, RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, blockUselessPackets); });
|
|
|
|
|
|
|
|
mod.hook(...proto.getData("S_SYSTEM_MESSAGE"), HOOK_SETTINGS.LAST, blockAnnoyingScreenMessages);
|
|
mod.hook(...proto.getData("S_SYSTEM_MESSAGE"), HOOK_SETTINGS.LAST, blockAnnoyingScreenMessages);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
mod.hook("C_SHOW_ITEMLIST", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, blockInventoryInCombat);
|
|
mod.hook("C_SHOW_ITEMLIST", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, blockInventoryInCombat);
|
|
|
mod.hook("S_INVEN_USERDATA", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, blockInventoryInCombat);
|
|
mod.hook("S_INVEN_USERDATA", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, blockInventoryInCombat);
|
|
|
mod.hook("S_ITEMLIST", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, blockInventoryInCombat);
|
|
mod.hook("S_ITEMLIST", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.LAST, blockInventoryInCombat);
|
|
@@ -357,8 +354,17 @@ class unitFps {
|
|
|
if (oldMode.blockShakeEffects !== newMode.blockShakeEffects) {
|
|
if (oldMode.blockShakeEffects !== newMode.blockShakeEffects) {
|
|
|
changeShakeState(newMode.blockShakeEffects);
|
|
changeShakeState(newMode.blockShakeEffects);
|
|
|
}
|
|
}
|
|
|
- if (oldMode.blockCollections !== newMode.blockCollections && newMode.blockCollections === true) {
|
|
|
|
|
- mod.send(...proto.getData("S_SPAWN_COLLECTION"), tracker);
|
|
|
|
|
|
|
+ //respawn collections back (nothing to analyze so we are just using original data )
|
|
|
|
|
+ if (oldMode.blockCollections !== newMode.blockCollections && newMode.blockCollections === false) {
|
|
|
|
|
+ for (const val of tracker.collections.values()) {
|
|
|
|
|
+ mod.send(...proto.getData("S_SPAWN_COLLECTION"), val);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ //respawn servants back
|
|
|
|
|
+ if (oldMode.blockOwnServants !== newMode.blockOwnServants && newMode.blockOwnServants === false) {
|
|
|
|
|
+ for (const val of tracker.blockedServants.values()) {
|
|
|
|
|
+ mod.send(...proto.getData("S_REQUEST_SPAWN_SERVANT"), val);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|