фиксы

Darkdustry-Coders · Jun 3, 2023 · 85c26b8 · 85c26b8
1 parent 4ef6dd5
commit 85c26b8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/darkdustry/utils/Admins.java b/src/main/java/darkdustry/utils/Admins.java
@@ -114,7 +114,7 @@ public static void checkBanned(NetConnection con, String locale) {
         var ban = Database.getBan(con.uuid, con.address);
         if (ban == null || ban.expired()) return;
 
-        kickReason(con, locale, ban.remaining(), ban.reason, "kick.ban").kick();
+        kickReason(con, locale, ban.remaining(), ban.reason, "kick.ban", ban.admin).kick();
     }
 
     // endregion

diff --git a/src/main/resources/bundles/bundle_en.properties b/src/main/resources/bundles/bundle_en.properties
@@ -235,7 +235,7 @@ kick.disclaimer = \n\n[accent]If you think this is a mistake or want to appeal t
 kick.extra-mods = [accent]Incompatible mods!\n[white]Extra mods:\n[lightgray]> {0}
 kick.missing-mods = [accent]Incompatible mods!\n[white]Missing mods:\n[lightgray]> {0}
 
-kick.ban = [scarlet]You are banned from this server.
+kick.ban = [scarlet]You are banned from this server.\n[scarlet]Administrator: [orange]{0}
 kick.subnet-ban = [scarlet]You are banned from this server by subnet.
 
 kick.vote-kicked = [scarlet]You were vote-kicked from this server. The voting was started by {0}[scarlet].
@@ -252,8 +252,8 @@ kick.name-is-empty = [scarlet]Please do not use an empty nickname on our server.
 
 kick.not-whitelisted = [scarlet]You are not whitelisted here.
 
-kick.kicked-by-admin = [scarlet]You have been kicked from this server by [orange]{0}[scarlet].
-kick.banned-by-admin = [scarlet]You have been banned from this server by [orange]{0}[scarlet].
+kick.kicked-by-admin = [scarlet]You have been kicked from this server.\n[scarlet]Administrator: [orange]{0}
+kick.banned-by-admin = [scarlet]You have been banned from this server.\n[scarlet]Administrator: [orange]{0}
 # endregion
 
 # RANKS

diff --git a/src/main/resources/bundles/bundle_ru.properties b/src/main/resources/bundles/bundle_ru.properties
@@ -234,7 +234,7 @@ kick.disclaimer = \n\n[accent]Если ты думаешь, что это оши
 kick.extra-mods = [accent]Несовместимые моды!\n[white]Лишние моды:\n[lightgray]> {0}
 kick.missing-mods = [accent]Несовместимые моды!\n[white]Недостающие моды:\n[lightgray]> {0}
 
-kick.ban = [scarlet]Ты заблокирован на этом сервере.
+kick.ban = [scarlet]Ты заблокирован на этом сервере.\n[scarlet]Администратор: [orange]{0}
 kick.subnet-ban = [scarlet]Ты заблокирован на этом сервере по подсети.
 
 kick.vote-kicked = [scarlet]Тебя выгнали с сервера голосованием. Голосование было начато игроком {0}[scarlet].
@@ -251,8 +251,8 @@ kick.name-is-empty = [scarlet]Пожалуйста, не используй пу
 
 kick.not-whitelisted = [scarlet]Ты не в белом списке сервера.
 
-kick.kicked-by-admin = [scarlet]Админ [orange]{0}[scarlet] выгнал тебя с этого сервера.
-kick.banned-by-admin = [scarlet]Админ [orange]{0}[scarlet] заблокировал тебя на этом сервере.
+kick.kicked-by-admin = [scarlet]Тебя выгнали с этого сервера.\n[scarlet]Администратор: [orange]{0}
+kick.banned-by-admin = [scarlet]Тебя заблокировали на этом сервере.\n[scarlet]Администратор: [orange]{0}
 # endregion
 
 # RANKS