|
|
@@ -10,6 +10,7 @@
|
|
|
* @typedef {import("../fpsManager.js").deps} deps
|
|
|
*/
|
|
|
|
|
|
+const rfdc = require("rfdc")({ "proto": true });
|
|
|
const utils = require("./helpers/utils");
|
|
|
const { ENTITY_HOOK_TYPE, RAW_HOOK_MODE, HOOK_SETTINGS, DESPAWN_TYPES, EVENTS, HPCHANGE, MPCHANGE } = require("./helpers/enums");
|
|
|
|
|
|
@@ -41,6 +42,50 @@ class unitFps {
|
|
|
// Basic internal functions
|
|
|
//-------------------------------------
|
|
|
// eslint-disable-next-line arrow-body-style
|
|
|
+
|
|
|
+ const modifyPlayerEvent = (event) => {
|
|
|
+ //return obj with desired fields so V8 can optimize it by default and will not move into slow properties
|
|
|
+ let res = { "event": event, "returnState": undefined };
|
|
|
+ if (data.activeMode.blockPlayersAppearance) {
|
|
|
+ if (data.activeMode.blockPlayersAppearance.voice) { res.event.appearance.voice = 69; res.returnState = true; }
|
|
|
+ if (data.activeMode.blockPlayersAppearance.allTitles) { res.event.title = 0; res.returnState = true; }
|
|
|
+ if (data.activeMode.blockPlayersAppearance.icons) { res.event.icons = []; res.returnState = true; }
|
|
|
+ if (data.activeMode.blockPlayersAppearance.allLook) {
|
|
|
+ res.event.showFace = false;
|
|
|
+ res.event.showStyle = false;
|
|
|
+ res.event.styleHead = 0;
|
|
|
+ res.event.styleFace = 0;
|
|
|
+ res.event.styleBack = 0;
|
|
|
+ res.event.styleWeapon = 0;
|
|
|
+ res.event.styleBody = 0;
|
|
|
+ res.event.underwearDye = 0;
|
|
|
+ res.event.styleBackDye = 0;
|
|
|
+ res.event.styleHeadDye = 0;
|
|
|
+ res.event.styleFaceDye = 0;
|
|
|
+ res.event.styleFootprint = 0;
|
|
|
+ res.event.styleHeadScale = 0;
|
|
|
+ res.event.styleFaceScale = 0;
|
|
|
+ res.event.styleBackScale = 0;
|
|
|
+ res.event.usedStyleHeadTransform = false;
|
|
|
+ res.event.styleBodyDye = 0;
|
|
|
+ res.event.body = 0;
|
|
|
+ res.event.hand = 0;
|
|
|
+ res.event.feet = 0;
|
|
|
+ res.event.underwear = 0;
|
|
|
+ res.event.head = 0;
|
|
|
+ res.event.face = 0;
|
|
|
+
|
|
|
+ res.returnState = true;
|
|
|
+ }
|
|
|
+ else if (data.activeMode.blockPlayersAppearance.p2wLook) {
|
|
|
+ res.event.showStyle = false;
|
|
|
+ res.event.showFace = false;
|
|
|
+ res.returnState = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return res;
|
|
|
+ };
|
|
|
+
|
|
|
const isEntityBlocked = (gameId) => {
|
|
|
return (blockedPlayers.has(gameId) || blockedNpcs.has(gameId) || blockedSummons.has(gameId) || blockedServants.has(gameId));
|
|
|
};
|
|
|
@@ -205,7 +250,7 @@ class unitFps {
|
|
|
blockedPlayers.add(key);
|
|
|
}
|
|
|
else if (!needBlock && blockedPlayers.has(key)) {
|
|
|
- mod.send(...proto.getData("S_SPAWN_USER"), value);
|
|
|
+ mod.send(...proto.getData("S_SPAWN_USER"), modifyPlayerEvent(rfdc(value)).event); //cloning to prevent pollution of original event
|
|
|
blockedPlayers.delete(key);
|
|
|
}
|
|
|
}
|
|
|
@@ -348,6 +393,7 @@ class unitFps {
|
|
|
};
|
|
|
|
|
|
const userHandler = (type, event) => {
|
|
|
+ let tmp = undefined;
|
|
|
switch (type) {
|
|
|
case (ENTITY_HOOK_TYPE.DESPAWN):
|
|
|
blockedPlayers.delete(event.gameId);
|
|
|
@@ -357,7 +403,10 @@ class unitFps {
|
|
|
blockedPlayers.add(event.gameId);
|
|
|
return false;
|
|
|
}
|
|
|
- break;
|
|
|
+ tmp = modifyPlayerEvent(event); //passing by reference, no need clone
|
|
|
+ // eslint-disable-next-line no-param-reassign
|
|
|
+ event = tmp.event;
|
|
|
+ return tmp.returnState;
|
|
|
}
|
|
|
};
|
|
|
|