add player & entity validity checks

Canopy [BP]/scripts/lib/canopy/Canopy.js

@@ -8,5 +8,11 @@ import { RuleHelpEntry, CommandHelpEntry, InfoDisplayRuleHelpEntry } from './hel
 import { RuleHelpPage, CommandHelpPage, InfoDisplayRuleHelpPage } from './help/HelpPage';
 import HelpBook from './help/HelpBook';
 
+function getLoadedExtensions() {
+    const ruleExtensions = Rule.getExtensionNames();
+    const commandExtensions = Command.getExtensionNames();
+    return [...new Set([...ruleExtensions, ...commandExtensions])];
+}
+
 export { Command, Rule, InfoDisplayRule, RuleHelpEntry, CommandHelpEntry, InfoDisplayRuleHelpEntry, 
-    RuleHelpPage, CommandHelpPage, InfoDisplayRuleHelpPage, HelpBook };
+    RuleHelpPage, CommandHelpPage, InfoDisplayRuleHelpPage, HelpBook, getLoadedExtensions };

Canopy [BP]/scripts/lib/canopy/Command.js

@@ -106,17 +106,17 @@ class Command {
 		result.sort((a, b) => a.getName().localeCompare(b.getName()));
 		return result;
 	}
-
-	static getExtensionNames() {
-		return Object.values(commands).map(cmd => cmd.getExtensionName()).filter(name => name);
-	}
-
+
 	static getCommandsByExtension(extensionName) {
 		let result = Object.values(commands).filter(cmd => cmd.getExtensionName() === extensionName);
 		result.sort((a, b) => a.getName().localeCompare(b.getName()));
 		return result;
 	}
 
+	static getExtensionNames() {
+		return Object.values(commands).map(cmd => cmd.getExtensionName()).filter(name => name);
+	}
+
     static checkArg(value, type) {
         let data;
         if (type == 'array' && Array.isArray(value)) data = value;

Canopy [BP]/scripts/lib/canopy/registry/CommandRegistry.js

@@ -13,5 +13,5 @@ system.afterEvents.scriptEventReceive.subscribe((event) => {
     }
     if (!cmdData) return;
     new Command(cmdData);
-    console.warn(`[Canopy] Registered command: ${cmdData.extensionName}:${cmdData.name}`);
+    // console.warn(`[Canopy] Registered command: ${cmdData.extensionName}:${cmdData.name}`);
 }, { namespaces: ['canopyExtension']});

Canopy [BP]/scripts/lib/canopy/registry/RuleRegistry.js

@@ -13,5 +13,5 @@ system.afterEvents.scriptEventReceive.subscribe((event) => {
     }
     if (!ruleData) return;
     new Rule(ruleData);
-    console.warn(`[Canopy] Registered rule: ${ruleData.extensionName}:${ruleData.identifier}`);
+    // console.warn(`[Canopy] Registered rule: ${ruleData.extensionName}:${ruleData.identifier}`);
 }, { namespaces: ['canopyExtension']});

Canopy [BP]/scripts/main.js

@@ -57,7 +57,7 @@ import ProbeManager from 'src/classes/ProbeManager';
 import { Command } from 'lib/canopy/Canopy';
 
 const players = world.getAllPlayers();
-if (players[0] !== undefined && players[0].isValid()) {
+if (players[0]?.isValid()) {
     Utils.broadcastActionBar('§aBehavior packs have been reloaded.');
     ProbeManager.startCleanupCycle();
     Command.broadcastPrefix();

Canopy [BP]/scripts/src/classes/ProbeManager.js

@@ -189,14 +189,14 @@ class ProbeManager {
         world.beforeEvents.playerLeave.subscribe((event) => {
             const player = event.player;
             system.run(() => {
-                if (player.getDynamicProperty('light') || player.getDynamicProperty('biome'))
+                if (player?.getDynamicProperty('light') || player?.getDynamicProperty('biome'))
                     this.removeProbe(player);
             });
         });
 
         world.afterEvents.playerDimensionChange.subscribe((event) => {
             const player = event.player;
-            if (player.getDynamicProperty('light') || player.getDynamicProperty('biome'))
+            if (player?.getDynamicProperty('light') || player?.getDynamicProperty('biome'))
                 this.removeProbe(player);
         });
 

Canopy [BP]/scripts/src/commands/camera.js

@@ -72,7 +72,7 @@ class BeforeSpectatorPlayer {
 
 world.beforeEvents.playerGameModeChange.subscribe((event) => {
     const player = event.player;
-    if (player.getDynamicProperty('isSpectating') && event.fromGameMode === 'spectator' && event.toGameMode !== 'spectator') {
+    if (player?.getDynamicProperty('isSpectating') && event.fromGameMode === 'spectator' && event.toGameMode !== 'spectator') {
         system.run(() => {
             player.setGameMode(event.fromGameMode);
             player.onScreenDisplay.setActionBar('§cYou cannot change your gamemode while spectating.');
@@ -81,7 +81,7 @@ world.beforeEvents.playerGameModeChange.subscribe((event) => {
 });
 
 world.beforeEvents.playerLeave.subscribe((event) => {
-    event.player.setDynamicProperty('isViewingCamera', false);
+    event.player?.setDynamicProperty('isViewingCamera', false);
 });
 
 world.afterEvents.playerDimensionChange.subscribe((event) => {

Canopy [BP]/scripts/src/commands/counter.js

@@ -295,7 +295,7 @@ function realtimeQueryAll(sender) {
 
 function query(sender, color) {
     const channel = channelMap.getChannel(color);
-    sender.sendMessage(channelMap.getQueryOutput(channel));
+    sender?.sendMessage(channelMap.getQueryOutput(channel));
 }
 
 function queryAll(sender) {
@@ -306,7 +306,7 @@ function queryAll(sender) {
     });
 
     if (output === '') output = '§7There are no hopper counters in use.';
-    sender.sendMessage(output);
+    sender?.sendMessage(output);
 }
 
 function setMode(sender, color, mode) {

Canopy [BP]/scripts/src/commands/log.js

@@ -158,7 +158,7 @@ world.afterEvents.entitySpawn.subscribe((event) => {
 
 world.beforeEvents.entityRemove.subscribe((event) => {
     const removedEntity = event.removedEntity;
-    if (removedEntity.typeId === 'minecraft:tnt') {
+    if (removedEntity?.typeId === 'minecraft:tnt') {
         loggingPlayers.forEach(loggingPlayer => {
             if (loggingPlayer.types.includes('tnt')) {
                 printTntLog(loggingPlayer.player, removedEntity);

Canopy [BP]/scripts/src/commands/resetall.js

@@ -13,7 +13,7 @@ function resetallCommand(sender) {
     world.clearDynamicProperties();
     const players = world.getAllPlayers();
     players.forEach(player => {
-        player.clearDynamicProperties();
+        player?.clearDynamicProperties();
     });
     world.sendMessage('§cPlayer and world dynamic properties have been reset.');
 }

Canopy [BP]/scripts/src/entities.js

@@ -28,6 +28,7 @@ const Entities = {
 
         let count = 0;
         for (const entity of entities) {
+            if (!entity) continue;
             try{
                 const toEntity = Utils.normalizeVector(subtractVectors(entity.location, player.location));
                 const dotProduct = Utils.dotProduct(viewDirection, toEntity);

Canopy [BP]/scripts/src/rules/InfoDisplay.js

@@ -90,8 +90,9 @@ new InfoDisplayRule({
 });
 
 system.runInterval(() => {
-	const Players = world.getAllPlayers();
-	for (const player of Players) {
+	const players = world.getAllPlayers();
+	for (const player of players) {
+		if (!player) continue;
 		if (InfoDisplayRule.getValue(player, 'showDisplay')) InfoDisplay(player);
 	}
 });

Canopy [BP]/scripts/src/rules/hotbarSwitching.js

@@ -24,6 +24,7 @@ system.runInterval(async () => {
     if (!await Rule.getValue('hotbarSwitching')) return;
     const players = world.getAllPlayers();
     for (const player of players) {
+        if (!player) continue;
         if (!await hasAppropriateGameMode(player)) continue;
         if (hotbarManagers[player.id] === undefined) 
             hotbarManagers[player.id] = new HotbarManager(player);

Canopy [BP]/scripts/src/rules/renewableElytra.js

@@ -7,8 +7,8 @@ new Rule({
     description: 'Phantoms have a 1%% chance to drop an elytra when killed by a shulker bullet.',
 });
 
-world.afterEvents.entityDie.subscribe(async (event) => {
-    if (!await Rule.getValue('renewableElytra')) return;
+world.afterEvents.entityDie.subscribe((event) => {
+    if (!Rule.getValue('renewableElytra')) return;
     const entity = event.deadEntity;
     if (entity?.typeId === 'minecraft:phantom' && event.damageSource.damagingProjectile?.typeId === 'minecraft:shulker_bullet') {
         if (Math.random() > 0.01) return;

Canopy [BP]/scripts/src/rules/renewableSponge.js

@@ -8,7 +8,7 @@ new Rule({
 });
 
 world.afterEvents.entityHurt.subscribe(async (event) => {
-    if (event.hurtEntity.typeId !== 'minecraft:guardian' || !await Rule.getValue('renewableSponge') || event.damageSource.cause !== 'lightning') 
+    if (event.hurtEntity?.typeId !== 'minecraft:guardian' || !await Rule.getValue('renewableSponge') || event.damageSource.cause !== 'lightning') 
         return;
 
     const guardian = event.hurtEntity;

Canopy [BP]/scripts/src/validWorld.js

@@ -1,14 +1,15 @@
 import { world, system } from '@minecraft/server';
 import Data from 'stickycore/data';
 import ProbeManager from 'src/classes/ProbeManager';
+import { getLoadedExtensions } from 'lib/canopy/Canopy';
 
 let hasShownWelcome = false;
 
 world.afterEvents.playerJoin.subscribe((event) => {
     let runner = system.runInterval(() => {
         const players = world.getPlayers({ name: event.playerName });
         players.forEach(player => {
-            if (!hasShownWelcome && player.isValid()) {
+            if (!hasShownWelcome && player?.isValid()) {
                 system.clearRun(runner);
                 hasShownWelcome = true;
                 onValidWorld(player);
@@ -33,4 +34,8 @@ function displayWelcome(player) {
     output += `§a+ ----- +\n`;
     output += `§7This server is running §l§aCanopy§r§7. Type ./help to get started.§r\n`;
     player.sendMessage(output);
+    const extensions = getLoadedExtensions();
+    if (extensions.length > 0) {
+        player.sendMessage(`§7Loaded extensions: §a${extensions.join('§7, §a')}`);
+    }
 }

Canopy [BP]/scripts/stickycore/data.js

@@ -117,6 +117,7 @@ class Data {
 
 		if (!blockRayResult && !entityRayResult) return '';
 		target = Utils.getClosestTarget(sender, blockRayResult, entityRayResult);
+		if (!target) return '';
 		try {
 			inventory = target.getComponent('inventory');
 		} catch(error) {

Canopy [BP]/scripts/stickycore/utils.js

@@ -210,7 +210,7 @@ class Utils {
 		let players;
 		if (sender) players = world.getPlayers({ excludeNames: [sender.name] });
 		else players = world.getAllPlayers();
-		players.forEach(player => player.onScreenDisplay.setActionBar(message));
+		players.forEach(player => player?.onScreenDisplay.setActionBar(message));
 	}
 
 	static locationInArea(area, position) {