blockmine 1.5.7 → 1.6.0

package/backend/src/core/BotProcess.js

@@ -160,6 +160,7 @@ process.on('message', async (message) => {
                 version: config.server.version,
                 auth: 'offline',
                 hideErrors: false,
+                chat: 'enabled',
             };
 
             if (config.proxyHost && config.proxyPort) {
@@ -210,8 +211,39 @@ process.on('message', async (message) => {
                     const userData = await UserService.getUser(username, bot.config.id, bot.config);
                     if (!userData) return null;
 
+                    const permissions = userData.permissionsSet ? Array.from(userData.permissionsSet) : [];
+
                     return {
-                        ...userData,
+                        id: userData.id,
+                        username: userData.username,
+                        isOwner: userData.isOwner,
+                        isBlacklisted: userData.isBlacklisted,
+                        permissions: permissions,
+                        groups: userData.groups,
+                        hasPermission: (permissionName) => {
+                            if (userData.isOwner) return true;
+                            if (!permissionName) return false;
+
+                            if (permissions.includes(permissionName)) {
+                                return true;
+                            }
+
+                            const permissionParts = permissionName.split('.');
+                            if (permissionParts.length > 1) {
+                                const domain = permissionParts[0];
+                                const wildcard = `${domain}.*`;
+                                if (permissions.includes(wildcard)) {
+                                    return true;
+                                }
+                            }
+                            
+                            if (permissions.includes('*')) {
+                                return true;
+                            }
+
+                            return false;
+                        },
+                        hasGroup: (groupName) => userData.hasGroup(groupName),
                         addGroup: (group) => bot.api.performUserAction(username, 'addGroup', { group }),
                         removeGroup: (group) => bot.api.performUserAction(username, 'removeGroup', { group }),
                         addPermission: (permission) => bot.api.performUserAction(username, 'addPermission', { permission }),
@@ -484,6 +516,10 @@ process.on('message', async (message) => {
                 }
             });
 
+            bot.on('death', () => {
+                sendEvent('botDied', { user: { username: bot.username } });
+            });
+
             bot.on('kicked', (reason) => {
                 let reasonText;
                 try { reasonText = JSON.parse(reason).text || reason; } catch (e) { reasonText = reason; }
@@ -509,11 +545,13 @@ process.on('message', async (message) => {
             });
 
             bot.on('entitySpawn', (entity) => {
+                if (!isReady) return;
                 const serialized = serializeEntity(entity);
                 sendEvent('entitySpawn', { entity: serialized });
             });
 
             bot.on('entityMoved', (entity) => {
+                if (!isReady) return;
                 const now = Date.now();
                 const lastSent = entityMoveThrottles.get(entity.id);
                 if (!lastSent || now - lastSent > 500) {
@@ -523,6 +561,7 @@ process.on('message', async (message) => {
             });
 
             bot.on('entityGone', (entity) => {
+                if (!isReady) return;
                 sendEvent('entityGone', { entity: serializeEntity(entity) });
                 entityMoveThrottles.delete(entity.id);
             });
@@ -531,7 +570,7 @@ process.on('message', async (message) => {
                 sendLog('[Event: spawn] Бот заспавнился в мире.');
                 setTimeout(() => {
                     isReady = true;
-                    sendLog('[BotProcess] Бот готов к приему событий playerJoined/playerLeft.');
+                    sendLog('[BotProcess] Бот готов к приему событий.');
                 }, 3000);
             });
         } catch (err) {

package/backend/src/core/EventGraphManager.js

@@ -149,6 +149,9 @@ class EventGraphManager {
             case 'playerLeft':
                 context.user = args.user;
                 break;
+            case 'botDied':
+                context.user = args.user;
+                break;
             case 'tick':
                 break;
             case 'entitySpawn':