fix(core): onDeath, onTakeDamage enum type generic inference, getKeys…

… return hump
dockfries · Dec 2, 2023 · 258667b · 258667b
1 parent 4ff710f
commit 258667b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/packages/core/src/controllers/player/entity.ts b/packages/core/src/controllers/player/entity.ts
@@ -329,8 +329,8 @@ export class Player {
     return { x, y, z };
   }
   getKeys() {
-    const [keys, updown, leftright] = f.GetPlayerKeys(this.id);
-    return { keys, updown, leftright };
+    const [keys, upDown, leftRight] = f.GetPlayerKeys(this.id);
+    return { keys, upDown, leftRight };
   }
   getIp(): string {
     return f.GetPlayerIp(this.id);

diff --git a/packages/core/src/controllers/player/event.ts b/packages/core/src/controllers/player/event.ts
@@ -81,7 +81,11 @@ export const [onClickPlayer] = defineEvent({
   },
 });
 
-export const [onDeath] = defineEvent({
+export const [onDeath] = defineEvent<{
+  player: Player;
+  killer: Player | InvalidEnum.PLAYER_ID;
+  reason: number;
+}>({
   name: "OnPlayerDeath",
   beforeEach(id: number, killer: number, reason: number) {
     return {
@@ -173,7 +177,13 @@ export const [onStreamOut] = defineEvent({
   },
 });
 
-export const [onTakeDamage] = defineEvent({
+export const [onTakeDamage] = defineEvent<{
+  player: Player;
+  damage: Player | InvalidEnum.PLAYER_ID;
+  amount: number;
+  weapon: WeaponEnum;
+  bodyPart: BodyPartsEnum;
+}>({
   name: "OnPlayerTakeDamage",
   beforeEach(
     id: number,