Skip to content

Show tempbanip expiration #6407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ivall wants to merge 1 commit into
base: 2.x
Choose a base branch
from
Open

Show tempbanip expiration #6407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,13 @@ public void onPlayerLoginBanned(final PlayerLoginEvent event) {
} else {
banEntry = ess.getServer().getBanList(BanList.Type.IP).getBanEntry(event.getAddress().getHostAddress());
if (banEntry != null) {
event.setKickMessage(AdventureUtil.miniToLegacy(tlLiteral("banIpJoin", banEntry.getReason())));
final Date banExpiry = banEntry.getExpiration();
if (banExpiry != null) {
final String expiry = DateUtil.formatDateDiff(banExpiry.getTime());
event.setKickMessage(AdventureUtil.miniToLegacy(tlLiteral("tempbanIpJoin", expiry, banEntry.getReason())));
} else {
event.setKickMessage(AdventureUtil.miniToLegacy(tlLiteral("banIpJoin", banEntry.getReason())));
}
}
}
}
Expand Down Expand Up @@ -680,7 +686,13 @@ public void onPlayerKickBanned(final AsyncPlayerPreLoginEvent event) {
} else {
banEntry = ess.getServer().getBanList(BanListType.IP).getBanEntry(event.getAddress());
if (banEntry != null) {
event.setKickMessage(AdventureUtil.miniToLegacy(tlLiteral("banIpJoin", banEntry.getReason())));
final Date banExpiry = banEntry.getExpiration();
if (banExpiry != null) {
final String expiry = DateUtil.formatDateDiff(banExpiry.getTime());
event.setKickMessage(AdventureUtil.miniToLegacy(tlLiteral("tempbanIpJoin", expiry, banEntry.getReason())));
} else {
event.setKickMessage(AdventureUtil.miniToLegacy(tlLiteral("banIpJoin", banEntry.getReason())));
}
}
}
} else if (event.getLoginResult() == AsyncPlayerPreLoginEvent.Result.KICK_WHITELIST) {
Expand Down
1 change: 1 addition & 0 deletions Essentials/src/main/resources/messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ banExempt=<dark_red>You cannot ban that player.
banExemptOffline=<dark_red>You may not ban offline players.
banFormat=<secondary>You have been banned\:\n<reset>{0}
banIpJoin=Your IP address is banned from this server. Reason\: {0}
tempbanIpJoin=Your IP address is temporarily banned from this server for {0}. Reason\: {1}
banJoin=You are banned from this server. Reason\: {0}
banipCommandDescription=Bans an IP address.
banipCommandUsage=/<command> <address> [reason]
Expand Down
1 change: 1 addition & 0 deletions Essentials/src/main/resources/messages_pl.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ banExempt=<dark_red>Nie możesz zablokować tego gracza.
banExemptOffline=<dark_red>Nie możesz blokować niedostępnych graczy.
banFormat=<dark_red>Zablokowano cię\: {0}
banIpJoin=Twój adres IP został na tym serwerze zablokowany. Powód\: {0}
tempbanIpJoin=Twój adres IP został na tym serwerze zablokowany na {0}. Powód\: {1}
banJoin=Zablokowano cię na tym serwerze. Powód\: {0}
banipCommandDescription=Blokuje adres IP.
banipCommandUsage=/<command> <adres> [powód]
Expand Down
Loading