fix dungeon

Author: leaftail1880

src/modules/chat/chat.ts

@@ -72,7 +72,7 @@ export class Chat {
 
         const messageText = event.message.replace(/\\n/g, '\n').replace(/§./g, '').trim()
 
-        const caps = messageText.split('').reduce((p, c) => (c === c.toUpperCase() ? p + 1 : p), 0)
+        const caps = messageText.split('').reduce((p, c) => (c !== c.toLowerCase() ? p + 1 : p), 0)
         if (caps > this.settings.capsLimit) {
           return event.sender.fail(noI18n.error`В сообщении слишком много капса (${caps}/${this.settings.capsLimit})`)
         }
@@ -85,7 +85,7 @@ export class Chat {
             location: event.sender.location,
             maxDistance: this.settings.range,
           })
-          .filter(e => e.id !== event.sender.id)
+          .filter(e => e.id !== event.sender.id && e.dimension.id === event.sender.dimension.id)
 
         // Array with ranged players (include sender id)
         const nID = nearPlayers.map(e => e.id)

src/modules/commands/leaderboard.ts

@@ -1,7 +1,10 @@
 /* i18n-ignore */
 
 import { Player, world } from '@minecraft/server'
-import { ActionForm, BUTTON, Leaderboard, ModalForm } from 'lib'
+import { ActionForm } from 'lib/form/action'
+import { ModalForm } from 'lib/form/modal'
+import { BUTTON } from 'lib/form/utils'
+import { Leaderboard, LeaderboardInfo } from 'lib/rpg/leaderboard'
 import { Vec } from 'lib/vector'
 
 new Command('leaderboard')
@@ -30,11 +33,7 @@ function info(lb: Leaderboard) {
   return lb.info.displayName + '\n' + Vec.string(Vec.floor(lb.info.location))
 }
 
-function editLeaderboard(
-  player: Player,
-  lb?: Leaderboard,
-  data: Partial<import('lib').LeaderboardInfo> = lb?.info ?? {},
-) {
+function editLeaderboard(player: Player, lb?: Leaderboard, data: Partial<LeaderboardInfo> = lb?.info ?? {}) {
   const action = lb ? 'Изменить ' : 'Выбрать '
   function update() {
     if (!lb && isRequired(data)) {
@@ -108,7 +107,6 @@ function editLeaderboard(
             data.location = { x, y, z }
           }
           data.dimension = dimension
-          if (lb && data.location) lb.entity.teleport(data.location, { dimension: world[dimension] })
           update()
         })
     })
@@ -128,15 +126,18 @@ function editLeaderboard(
         })
     })
 
-  if (lb) form.ask('§cУдалить таблицу лидеров', '§cУдалить', () => lb && lb.remove(), 'Отмена')
+  if (lb) {
+    form.button('Переместить к себе', () => {
+      data.location = Vec.floor(player.location).add(Vec.one.multiply(0.5))
+      data.dimension = player.dimension.type
+      update()
+    })
+    form.ask('§cУдалить таблицу лидеров', '§cУдалить', () => lb && lb.remove(), 'Отмена')
+  }
 
   form.show(player)
 }
 
-/**
- * @param {Partial<import('lib').LeaderboardInfo>} data
- * @returns {data is import('lib').LeaderboardInfo}
- */
-function isRequired(data: Partial<import('lib').LeaderboardInfo>): data is import('lib').LeaderboardInfo {
+function isRequired(data: Partial<LeaderboardInfo>): data is LeaderboardInfo {
   return !!data.dimension && !!data.displayName && !!data.location && !!data.objective && !!data.style
 }

src/modules/places/dungeons/dungeon.ts

@@ -319,7 +319,7 @@ export class DungeonRegion extends Region {
   private brokenTypeIdsMap = new Map([['evoker', MinecraftEntityTypes.EvocationIllager]])
 
   private spawn(spawner: DungeonSpawner): boolean {
-    if (!anyPlayerNear(spawner.location, this.dimensionType, 50)) return true
+    if (!anyPlayerNear(spawner.location, this.dimensionType, 50)) return false
 
     // eslint-disable-next-line prefer-const
     for (let { typeId, amount } of spawner.entities) {
@@ -333,7 +333,7 @@ export class DungeonRegion extends Region {
         continue
       }
 
-      const entities = this.dimension.getEntities({ location: spawner.location, maxDistance: 20 })
+      const entities = this.dimension.getEntities({ location: spawner.location, type: typeId, maxDistance: 20 })
       if (entities.length < amount) {
         const toSpawn = amount - entities.length
         logger.info(