|
@@ -48,13 +48,11 @@ class unitFps {
|
|
|
const meInCombat = () => mod.game.me.inCombat;
|
|
const meInCombat = () => mod.game.me.inCombat;
|
|
|
|
|
|
|
|
const isDropBlockable = (event) => {
|
|
const isDropBlockable = (event) => {
|
|
|
- if (data.activeMode.blockDropItems && data.activeMode.blockDropItems) {
|
|
|
|
|
- if (data.activeMode.blockDropItems.all) {
|
|
|
|
|
|
|
+ if (data.activeMode.blockDropItems) {
|
|
|
|
|
+ if (data.activeMode.blockDropItems.all)
|
|
|
return true;
|
|
return true;
|
|
|
- }
|
|
|
|
|
- else if (data.activeMode.blockDropItems.templateId && utils.arraysHasIntersect(event.templateId, data.activeMode.blockDropItems.templateId)) {
|
|
|
|
|
|
|
+ else if (data.activeMode.blockDropItems.templateId && utils.arraysHasIntersect(event.templateId, data.activeMode.blockDropItems.templateId))
|
|
|
return true;
|
|
return true;
|
|
|
- }
|
|
|
|
|
}
|
|
}
|
|
|
return false;
|
|
return false;
|
|
|
};
|
|
};
|
|
@@ -77,24 +75,20 @@ class unitFps {
|
|
|
|
|
|
|
|
const isSummonsBlockable = (event) => {
|
|
const isSummonsBlockable = (event) => {
|
|
|
if (data.activeMode.blockSummons) {
|
|
if (data.activeMode.blockSummons) {
|
|
|
- if (data.activeMode.blockSummons.me && isMe(event.owner)) {
|
|
|
|
|
|
|
+ if (data.activeMode.blockSummons.me && isMe(event.owner))
|
|
|
return true;
|
|
return true;
|
|
|
- }
|
|
|
|
|
- else if (data.activeMode.blockSummons.area && !isMe(event.owner)) {
|
|
|
|
|
|
|
+ else if (data.activeMode.blockSummons.area && !isMe(event.owner))
|
|
|
return true;
|
|
return true;
|
|
|
- }
|
|
|
|
|
}
|
|
}
|
|
|
return false;
|
|
return false;
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
const isNpcBlockable = (event) => {
|
|
const isNpcBlockable = (event) => {
|
|
|
if (data.activeMode.blockNpcs) {
|
|
if (data.activeMode.blockNpcs) {
|
|
|
- if (utils.arraysHasIntersect(event.templateId, data.activeMode.blockNpcs.templateId)) {
|
|
|
|
|
|
|
+ if (utils.arraysHasIntersect(event.templateId, data.activeMode.blockNpcs.templateId))
|
|
|
return true;
|
|
return true;
|
|
|
- }
|
|
|
|
|
- else if (utils.arraysHasIntersect(event.huntingZoneId, data.activeMode.blockNpcs.huntingZoneId)) {
|
|
|
|
|
|
|
+ else if (utils.arraysHasIntersect(event.huntingZoneId, data.activeMode.blockNpcs.huntingZoneId))
|
|
|
return true;
|
|
return true;
|
|
|
- }
|
|
|
|
|
}
|
|
}
|
|
|
return false;
|
|
return false;
|
|
|
};
|
|
};
|
|
@@ -105,14 +99,12 @@ class unitFps {
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
else if (data.activeMode.blockPlayers.class) {
|
|
else if (data.activeMode.blockPlayers.class) {
|
|
|
- if (utils.arraysHasIntersect(data.userTemplateToClassMap[event.templateId], data.activeMode.blockPlayers.class)) {
|
|
|
|
|
|
|
+ if (utils.arraysHasIntersect(data.userTemplateToClassMap[event.templateId], data.activeMode.blockPlayers.class))
|
|
|
return true;
|
|
return true;
|
|
|
- }
|
|
|
|
|
}
|
|
}
|
|
|
else if (data.activeMode.blockPlayers.name) {
|
|
else if (data.activeMode.blockPlayers.name) {
|
|
|
- if (utils.arraysHasIntersect(event.name, data.activeMode.blockPlayers.name)) {
|
|
|
|
|
|
|
+ if (utils.arraysHasIntersect(event.name, data.activeMode.blockPlayers.name))
|
|
|
return true;
|
|
return true;
|
|
|
- }
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
return false;
|
|
return false;
|
|
@@ -141,9 +133,7 @@ class unitFps {
|
|
|
case (ENTITY_HOOK_TYPE.DESPAWN):
|
|
case (ENTITY_HOOK_TYPE.DESPAWN):
|
|
|
break;
|
|
break;
|
|
|
case (ENTITY_HOOK_TYPE.SPAWN):
|
|
case (ENTITY_HOOK_TYPE.SPAWN):
|
|
|
- if (isCollectionBlockable()) {
|
|
|
|
|
- return false;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ if (isCollectionBlockable()) return false;
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
@@ -199,14 +189,14 @@ class unitFps {
|
|
|
|
|
|
|
|
const projectileHandler = (event) => {
|
|
const projectileHandler = (event) => {
|
|
|
if (isEntityBlocked(event.gameId)) return false;
|
|
if (isEntityBlocked(event.gameId)) return false;
|
|
|
- if (data.activeMode.blockProjectiles && data.activeMode.blockProjectiles) {
|
|
|
|
|
|
|
+ if (data.activeMode.blockProjectiles) {
|
|
|
if (data.activeMode.blockProjectiles.players && tracker.spawnedPlayers.has(event.gameId)) return false;
|
|
if (data.activeMode.blockProjectiles.players && tracker.spawnedPlayers.has(event.gameId)) return false;
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
const blockAdditionalSkillEffectsHandler = (event) => {
|
|
const blockAdditionalSkillEffectsHandler = (event) => {
|
|
|
if (isEntityBlocked(event.gameId)) return false;
|
|
if (isEntityBlocked(event.gameId)) return false;
|
|
|
- if (data.activeMode.blockAdditionalSkillEffects && data.activeMode.blockAdditionalSkillEffects) {
|
|
|
|
|
|
|
+ if (data.activeMode.blockAdditionalSkillEffects) {
|
|
|
if (data.activeMode.blockAdditionalSkillEffects.players && tracker.spawnedPlayers.has(event.gameId)) return false;
|
|
if (data.activeMode.blockAdditionalSkillEffects.players && tracker.spawnedPlayers.has(event.gameId)) return false;
|
|
|
if (data.activeMode.blockAdditionalSkillEffects.own && isMe(event.gameId)) return false;
|
|
if (data.activeMode.blockAdditionalSkillEffects.own && isMe(event.gameId)) return false;
|
|
|
}
|
|
}
|