This repository was archived by the owner on Jul 28, 2024. It is now read-only.
File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -350,22 +350,30 @@ function trInfo(_key, ..._args) {
350350 logger . info ( Color . transformToConsole ( tr ( ...arguments ) ) ) ;
351351}
352352function logError ( msg , e , player ) {
353- let errorMessage = null ;
354- let stack = null ;
355- if ( e instanceof Error ) {
356- errorMessage = e . message ;
357- stack = e . stack ;
358- } else if ( typeof ( e ) == "string" ) {
359- errorMessage = e ;
360- } else {
361- errorMessage = JSON . stringify ( e ) ;
362- }
363- if ( player ) {
364- player . tell ( `${ Color . RED } ${ msg } : ${ errorMessage } ` ) ;
365- }
366- logger . error ( `${ msg } : ${ errorMessage } ` ) ;
367- if ( stack ) {
368- logger . error ( stack ) ;
353+ try {
354+ let errorMessage = null ;
355+ let stack = null ;
356+ if ( e instanceof Error ) {
357+ errorMessage = e . message ;
358+ stack = e . stack ;
359+ } else if ( typeof ( e ) == "string" ) {
360+ errorMessage = e ;
361+ } else {
362+ errorMessage = JSON . stringify ( e ) ;
363+ }
364+ if ( player ) {
365+ if ( typeof player == "string" )
366+ player = mc . getPlayer ( player ) ;
367+ if ( player )
368+ player . tell ( `${ Color . RED } ${ msg } : ${ errorMessage } ` ) ;
369+ }
370+ logger . error ( `${ msg } : ${ errorMessage } ` ) ;
371+ if ( stack ) {
372+ logger . error ( stack ) ;
373+ }
374+ } catch ( e ) {
375+ logger . error ( `[logError] ${ e . message } ` ) ;
376+ logger . error ( `[logError] ${ e . stack } ` ) ;
369377 }
370378}
371379
Original file line number Diff line number Diff line change @@ -896,6 +896,9 @@ class FakePlayerFormHelper {
896896 this . tell ( this . OPERATIONS . Cancel ) ;
897897 return ;
898898 }
899+ if ( ! this . manager . ready ) {
900+ throw new Error ( 'FakePlayerManager is not ready' ) ;
901+ }
899902 let msg ;
900903 switch ( menus [ id ] ) {
901904 case FORM_MENU . Agent :
@@ -1092,9 +1095,11 @@ class FakePlayerManager {
10921095 } ) ;
10931096 }
10941097 sendMenuForm ( player ) {
1095- this . refreshData ( ) ;
1096- let fh = new FakePlayerFormHelper ( this , player ) ;
1097- fh . sendMenuForm ( ) . catch ( e => {
1098+ ( async ( ) => {
1099+ this . refreshData ( ) ;
1100+ let fh = new FakePlayerFormHelper ( this , player ) ;
1101+ await fh . sendMenuForm ( ) ;
1102+ } ) ( ) . catch ( e => {
10981103 logError ( 'sendMenuForm' , e , player ) ;
10991104 } ) ;
11001105 }
@@ -1723,7 +1728,7 @@ class FakePlayerWebSocketController extends FakePlayerController {
17231728 if ( ! this . ready ) {
17241729 if ( ! await this . connectWebsocket ( ) ) {
17251730 if ( Settings . debugMode ) logError ( "Error in send msg" , msg ) ;
1726- throw new Error ( tr ( "ws.error.send" , { code : this . wsc . errorCode ( ) } ) ) ;
1731+ new Error ( tr ( "ws.error.send" , { code : this . wsc . errorCode ( ) } ) ) ;
17271732 }
17281733 }
17291734 return new Promise ( ( resolve , reject ) => {
You can’t perform that action at this time.
0 commit comments