diff --git a/src/main/java/org/ultramine/server/internal/UMEventHandler.java b/src/main/java/org/ultramine/server/internal/UMEventHandler.java index b6590ad..38bdc07 100644 --- a/src/main/java/org/ultramine/server/internal/UMEventHandler.java +++ b/src/main/java/org/ultramine/server/internal/UMEventHandler.java @@ -160,23 +160,9 @@ loadcomp.getChatStyle().setColor(load > 100 ? RED : DARK_GREEN); pickloadcomp.getChatStyle().setColor(pickload >= 200 ? RED : DARK_GREEN); tpscomp.getChatStyle().setColor(tps < 15 ? RED : DARK_GREEN); - - int mobcount = 0; - int itemcount = 0; - - for(WorldServer world : server.getMultiWorld().getLoadedWorlds()) - { - for(Entity ent : GenericIterableFactory.newCastingIterable(world.loadedEntityList, Entity.class)) - { - if(ent.isEntityLiving() && !ent.isEntityPlayer()) - mobcount++; - else if(ent instanceof EntityItem) - itemcount++; - } - } - + ChatComponentTranslation full = new ChatComponentTranslation("ultramine.autobroadcast.debugmsg", loadcomp, pickloadcomp, tpscomp, - Integer.toString(mobcount), Integer.toString(itemcount), server.getConfigurationManager().playerEntityList.size()); + server.getConfigurationManager().playerEntityList.size()); full.getChatStyle().setColor(YELLOW); server.addChatMessage(full); diff --git a/src/main/resources/assets/ultramine/lang/en_US.lang b/src/main/resources/assets/ultramine/lang/en_US.lang index 5d47bba..6b1780c 100644 --- a/src/main/resources/assets/ultramine/lang/en_US.lang +++ b/src/main/resources/assets/ultramine/lang/en_US.lang @@ -4,7 +4,7 @@ ultramine.teleporter.delay=You will be teleported in %s seconds ultramine.teleporter.canceled=Teleportation canceled -ultramine.autobroadcast.debugmsg=Server load: %s (Peak: %s), TPS: %s/20, Mobs: %s, Items: %s, Players: %s +ultramine.autobroadcast.debugmsg=Server load: %s (Peak: %s), TPS: %s/20, Players: %s ultramine.autobackup.start=Autobackup started ultramine.tools.itemblocker.useitem=Use of this item is forbidden by server diff --git a/src/main/resources/assets/ultramine/lang/ru_RU.lang b/src/main/resources/assets/ultramine/lang/ru_RU.lang index e2cf785..cedad27 100644 --- a/src/main/resources/assets/ultramine/lang/ru_RU.lang +++ b/src/main/resources/assets/ultramine/lang/ru_RU.lang @@ -4,7 +4,7 @@ ultramine.teleporter.delay=Вы будете телепортированы через %s секунд ultramine.teleporter.canceled=Телепортация отменена -ultramine.autobroadcast.debugmsg=Сервер нагружен на %s (В пике - %s), Тиков в секунду: %s/20, Мобов: %s, Предметов: %s, Игроков: %s +ultramine.autobroadcast.debugmsg=Сервер нагружен на %s (В пике - %s), Тиков в секунду: %s/20, Игроков: %s ultramine.autobackup.start=Выполняется автоматический бэкап мира ultramine.tools.itemblocker.useitem=Использование данного предмета запрещено сервером