From f324dc4aff633eba779f819628a0a9c06422f458 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Sat, 4 Nov 2023 10:23:44 +0300 Subject: [PATCH] fix tsc & use prepare for now --- package.json | 2 +- src/lib/modules/effects.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 77d78088..f1a88d1d 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "scripts": { "start": "tsc && node dist/app.js", "build": "tsc && node scripts/genTypes.mjs", - "prepublishOnly": "pnpm build", + "prepare": "pnpm build", "lint": "eslint src/**", "fix": "eslint src/** --fix", "mocha_test": "mocha --reporter spec --timeout 3000 --exit", diff --git a/src/lib/modules/effects.ts b/src/lib/modules/effects.ts index 51a38287..d8e90184 100644 --- a/src/lib/modules/effects.ts +++ b/src/lib/modules/effects.ts @@ -46,7 +46,7 @@ export const entity = function (entity: Entity, serv: Server) { } else return false } - entity.removeEffect = (effectId, opt) => { + entity.removeEffect = (effectId, opt?) => { clearTimeout(entity.effects[effectId].timeout) entity.effects[effectId] = null entity.sendRemoveEffect(effectId, opt) @@ -89,7 +89,7 @@ export const server = function (serv: Server, options: Options) { }) }) } - const chatSelect = (targets.length === 1 ? (targets[0].type === 'player' ? targets[0].username : 'entity') : 'entities') + const chatSelect = (targets.length === 1 ? (targets[0].type === 'player' ? (targets[0] as Player).username : 'entity') : 'entities') if (params[2] === 'clear') { if (ctx.player) ctx.player.chat('Remove all effects from ' + chatSelect + '.') else serv.info('Remove all effects from ' + chatSelect + '.') @@ -111,6 +111,6 @@ declare global { "sendEffect": (effectId: any, { amplifier, duration, particles, whitelist, blacklist }?: { amplifier?: number | undefined; duration?: number | undefined; particles?: boolean | undefined; whitelist?: any; blacklist?: any[] | undefined }) => void "sendRemoveEffect": (effectId: any, { whitelist, blacklist }?: { whitelist?: any; blacklist?: any[] | undefined }) => void "addEffect": (effectId: any, opt?: {}) => boolean - "removeEffect": (effectId: any, opt: any) => void + removeEffect: (effectId: any, opt?: any) => void } }