Merge branch 'master' into develop

This commit is contained in:
Gregoire Parant 2021-04-19 21:19:35 +02:00
commit 5e8951fdaa
4 changed files with 5 additions and 3 deletions

View file

@ -5,6 +5,7 @@ export enum AdminMessageEventTypes {
admin = 'message',
audio = 'audio',
ban = 'ban',
banned = 'banned',
}
interface AdminMessageEvent {

View file

@ -188,7 +188,7 @@ export class RoomConnection implements RoomConnection {
} else if (message.hasSendusermessage()) {
adminMessagesService.onSendusermessage(message.getSendusermessage() as SendUserMessage);
} else if (message.hasBanusermessage()) {
adminMessagesService.onSendusermessage(message.getSendusermessage() as BanUserMessage);
adminMessagesService.onSendusermessage(message.getBanusermessage() as BanUserMessage);
} else if (message.hasWorldfullwarningmessage()) {
worldFullWarningStream.onMessage();
} else if (message.hasRefreshroommessage()) {

View file

@ -34,7 +34,7 @@ const fps : Phaser.Types.Core.FPSConfig = {
/**
* Use setTimeout instead of requestAnimationFrame to run the game loop.
*/
forceSetTimeOut: true,
forceSetTimeOut: false,
/**
* Calculate the average frame delta from this many consecutive frame intervals.
*/