@@ -4,27 +4,28 @@ import {
44} from "@minecraft/server" ;
55import { registerCommand } from "../commandRegistry.js"
66import { messages } from "../../messages.js"
7- import * as db from "../../utilities/storage .js"
8- import "../../utilities/getTopBlock .js"
7+ import * as db from "../../utilities/DatabaseHandler .js"
8+ import "../../utilities/FetchTopBlock .js"
99
1010const commandInformation = {
1111 name : "spreadplayers" ,
1212 description : "Spread out players around the overworld." ,
13+ permissionLevel : 1 ,
1314 aliases : [ ] ,
1415 usage :[
1516 {
1617 name : "radius" ,
17- type : 9 , // change later, should be int
18+ type : "Integer" ,
1819 optional : false
1920 } ,
2021 {
2122 name : "setSpawnPoint" ,
22- type : 9 , // change later, should be Boolean
23- optional true ,
24- }
23+ type : " Boolean" ,
24+ optional : true ,
25+ } ,
2526 {
2627 name : "includeAdmin" ,
27- type; 9 , // change later, should be Boolean
28+ type : " Boolean" ,
2829 optional : true
2930 }
3031 ]
@@ -33,15 +34,13 @@ const commandInformation = {
3334registerCommand ( commandInformation , ( origin , radius , setSpawnPoint = false , includeAdmin = false ) => {
3435
3536 const player = origin . sourceEntity
36- if ( ! player . isAdmin ( ) ) return player . sendMessage ( messages . MUST_BE_ADMIN )
37-
3837 let recentPlayerList = db . fetch ( "recentPlayerList" , true ) ;
3938
4039 for ( const selectedPlayer of world . getPlayers ( ) ) {
41- if ( ! includeAdmin && selectedPlayer . isAdmin ( ) ) continue ;
40+ if ( ! includeAdmin && selectedPlayer . commandPermission === 1 ) continue ;
4241 let x = Math . floor ( Math . random ( ) * radius ) + 1 ;
4342 let z = Math . floor ( Math . random ( ) * radius ) + 1 ;
44- selectedPlayer . tryTeleport ( { x, y : 320 , z} )
43+ system . run ( ( ) => selectedPlayer . tryTeleport ( { x, y : 320 , z} ) )
4544
4645 const runner = system . runInterval ( ( ) => {
4746 const topBlock = getTopBlock ( { x, z} )
@@ -67,13 +66,14 @@ registerCommand(commandInformation, (origin, radius, setSpawnPoint = false, incl
6766 z : z
6867 }
6968 } )
70- selectedPlayer . runCommand ( `spawnpoint @s ${ x } ${ topBlock . location . y + 1 } ${ z } ` ) : null
69+ system . run ( ( ) => selectedPlayer . runCommand ( `spawnpoint @s ${ x } ${ topBlock . location . y + 1 } ${ z } ` ) )
70+ db . store ( "recentPlayerList" , recentPlayerList )
7171 }
7272 system . clearRun ( runner )
7373 }
7474 } , 1 * 20 )
7575 }
76- player . sendMessage ( messages . SUCCESS_CHANGES_SPAWN_MODE . replace ( "{0}" , mode ) )
76+ player . sendMessage ( messages . SUCCESS_SPREAD_PLAYERS )
7777 return {
7878 status : 0
7979 }
0 commit comments