@block_factory/lib 0.0.8 → 0.0.9

package/_module/util/Wrapper/IPlayer.ts

@@ -2,7 +2,7 @@ import { Player, EntityInventoryComponent, PlayAnimationOptions, system, world,
 import { IContainer, Inventory } from "./_Container";
 import { iSystem } from "../ISystem";
 import { Ctor, PropertyRecord } from "../Globals";
-import { WrapperCore } from "./_Common";
+import { CLASS_I_UUID, WrapperCore } from "./_Common";
 
 export type IPlayer<T extends ICustomPlayer> = T & Player;
 
@@ -41,6 +41,7 @@ export abstract class ICustomPlayer {
   public data?(): PropertyRecord;
   public onReady?(): void;
   public interval?(): void;
+  public onLeave?(): void;
 }
 
 const cache = new Map<string, Map<Function, any>>();
@@ -59,6 +60,17 @@ class PlayerWrapper {
   }
 }
 
+world.beforeEvents.playerLeave.subscribe((event) => {
+  const classId = event.player.getDynamicProperty(CLASS_I_UUID) as string | undefined;
+  system.run(() => {
+    if (!classId) return;
+    const Ctor = iSystem.iClassRegistry.get(classId);
+    if (!Ctor) return;
+    const wrapped = ICustomPlayer.wrap(event.player, Ctor);
+    wrapped.onLeave?.();
+  })
+});
+
 //Delete from cache on remove
 world.afterEvents.playerLeave.subscribe(({ playerId }) => {
   if (!cache.has(playerId)) return;

package/_module/util/Wrapper/_Common.ts

@@ -28,7 +28,6 @@ export class WrapperCore {
 
     const existing = byCtor.get(Ctor) as W | undefined;
     if (existing) return existing;
-
     const inst = new (Ctor as any)(source);
     const proxied = iSystem.ProxyConstructor(inst, source) as W;
 
@@ -36,7 +35,9 @@ export class WrapperCore {
     proxied.onReady?.();
 
     byCtor.set(Ctor, proxied);
-    source.setDynamicProperty(CLASS_I_UUID, Ctor.name);
+    try {
+      source.setDynamicProperty(CLASS_I_UUID, Ctor.name);
+    } catch (error) {/*Stops void players from throwing errors on logout*/}
 
     return proxied;
   }
@@ -54,7 +55,6 @@ export class WrapperCore {
 
     const Ctor = registry.get(classId);
     if (!Ctor) return;
-
     wrapFn(source as any, Ctor);
   }
 
@@ -100,7 +100,6 @@ export class WrapperCore {
 
   public static loadDynData(target: DynStore): void {
     if (!target.data) return;
-
     const schema = target.data() as Record<string, unknown>;
     for (const key of Object.keys(schema)) {
       const v = target.getDynamicProperty(key);
@@ -110,7 +109,6 @@ export class WrapperCore {
 
   public static saveDynData(target: DynStore): void {
     if (!target.isValid || !target.data) return;
-
     const saveData = target.data() as Record<string, unknown>;
     for (const [key, value] of Object.entries(saveData)) {
       target.setDynamicProperty(key, value as PropertyValue);

package/index.js

@@ -160,7 +160,10 @@ var WrapperCore = class {
     proxied.loadData();
     proxied.onReady?.();
     byCtor.set(Ctor, proxied);
-    source.setDynamicProperty(CLASS_I_UUID, Ctor.name);
+    try {
+      source.setDynamicProperty(CLASS_I_UUID, Ctor.name);
+    } catch (error) {
+    }
     return proxied;
   }
   static repopulate(cache3, source, registry, wrapFn) {
@@ -273,6 +276,16 @@ var PlayerWrapper = class {
     return WrapperCore.iterateByCtor(cache, Ctor);
   }
 };
+world.beforeEvents.playerLeave.subscribe((event) => {
+  const classId = event.player.getDynamicProperty(CLASS_I_UUID);
+  system4.run(() => {
+    if (!classId) return;
+    const Ctor = iSystem.iClassRegistry.get(classId);
+    if (!Ctor) return;
+    const wrapped = ICustomPlayer.wrap(event.player, Ctor);
+    wrapped.onLeave?.();
+  });
+});
 world.afterEvents.playerLeave.subscribe(({ playerId }) => {
   if (!cache.has(playerId)) return;
   cache.delete(playerId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@block_factory/lib",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "main": "index.js",
   "types": "index.d.ts",
   "description": "Typescript Library for Minecraft Bedrock Edition",