More improvements

This commit is contained in:
2025-01-04 19:05:54 +01:00
parent 067976c54a
commit 9a448542d3
11 changed files with 38 additions and 184 deletions

View File

@ -13,22 +13,11 @@ export default class AlertCommandEvent extends BaseEvent {
private async handleEvent(data: TypePayload, callback: (response: boolean) => void): Promise<void> {
try {
if (!ChatService.isCommand(data.message, 'alert')) {
return
}
// Check if command is alert
if (!ChatService.isCommand(data.message, 'alert')) return
// Check if character exists
const character = await CharacterRepository.getByUserAndId(this.socket.userId!, this.socket.characterId!)
if (!character) {
this.logger.error('chat:alert_command error', 'Character not found')
return callback(false)
}
// Check if the user is the GM
if (character.role !== 'gm') {
this.logger.info(`User ${character.id} tried to set time but is not a game master.`)
return callback(false)
}
if (!(await this.isCharacterGM())) return
const args = ChatService.getArgs('alert', data.message)

View File

@ -14,22 +14,11 @@ export default class SetTimeCommand extends BaseEvent {
private async handleEvent(data: TypePayload, callback: (response: boolean) => void): Promise<void> {
try {
if (!ChatService.isCommand(data.message, 'time')) {
return
}
// Check if command is time
if (!ChatService.isCommand(data.message, 'time')) return
// Check if character exists
const character = await CharacterRepository.getByUserAndId(this.socket.userId!, this.socket.characterId!)
if (!character) {
this.logger.error('chat:alert_command error', 'Character not found')
return
}
// Check if the user is the GM
if (character.role !== 'gm') {
this.logger.info(`User ${character.id} tried to set time but is not a game master.`)
return
}
// Check if character exists and is GM
if (!(await this.isCharacterGM())) return
// Get arguments
const args = ChatService.getArgs('time', data.message)

View File

@ -16,21 +16,15 @@ export default class TeleportCommandEvent extends BaseEvent {
private async handleEvent(data: TypePayload, callback: (response: boolean) => void) {
try {
const mapCharacter = MapManager.getCharacterById(this.socket.characterId!)
if (!mapCharacter) {
this.logger.error('chat:message error', 'Character not found')
return
}
const character = mapCharacter.character
if (character.role !== 'gm') {
this.logger.info(`User ${character.id} tried to set time but is not a game master.`)
return
}
// Check if command is teleport
if (!ChatService.isCommand(data.message, 'teleport')) return
// Check if character exists and is GM
if (!(await this.isCharacterGM())) return
const character = await this.getCharacter()
if (!character) return
const args = ChatService.getArgs('teleport', data.message)
if (!args || args.length === 0 || args.length > 3) {
@ -53,7 +47,8 @@ export default class TeleportCommandEvent extends BaseEvent {
return
}
const map = await MapRepository.getById(mapId)
const mapRepository = new MapRepository()
const map = await mapRepository.getById(mapId)
if (!map) {
this.socket.emit('notification', {
title: 'Server message',

View File

@ -14,22 +14,11 @@ export default class ToggleFogCommand extends BaseEvent {
private async handleEvent(data: TypePayload, callback: (response: boolean) => void): Promise<void> {
try {
if (!ChatService.isCommand(data.message, 'fog')) {
return
}
// Check if command is fog
if (!ChatService.isCommand(data.message, 'fog')) return
// Check if character exists
const character = await CharacterRepository.getByUserAndId(this.socket.userId!, this.socket.characterId!)
if (!character) {
this.logger.error('chat:alert_command error', 'Character not found')
return
}
// Check if the user is the GM
if (character.role !== 'gm') {
this.logger.info(`User ${character.id} tried to set time but is not a game master.`)
return
}
// Check if character exists and is GM
if (!(await this.isCharacterGM())) return
await WeatherManager.toggleFog()
} catch (error: any) {

View File

@ -14,22 +14,11 @@ export default class ToggleRainCommand extends BaseEvent {
private async handleEvent(data: TypePayload, callback: (response: boolean) => void): Promise<void> {
try {
if (!ChatService.isCommand(data.message, 'rain')) {
return
}
// Check if command is rain
if (!ChatService.isCommand(data.message, 'rain')) return
// Check if character exists
const character = await CharacterRepository.getByUserAndId(this.socket.userId!, this.socket.characterId!)
if (!character) {
this.logger.error('chat:alert_command error', 'Character not found')
return
}
// Check if the user is the GM
if (character.role !== 'gm') {
this.logger.info(`User ${character.id} tried to set time but is not a game master.`)
return
}
// Check if character exists and is GM
if (!(await this.isCharacterGM())) return
await WeatherManager.toggleRain()
} catch (error: any) {

View File

@ -26,7 +26,8 @@ export default class ChatMessageEvent extends BaseEvent {
const character = mapCharacter.character
const map = await MapRepository.getById(character.map.id)
const mapRepository = new MapRepository()
const map = await mapRepository.getById(character.map.id)
if (!map) {
this.logger.error('chat:message error', 'Map not found')
return callback(false)