Merge branch 'master' into master

This commit is contained in:
sekwah41 2019-07-03 11:11:51 +01:00 committed by GitHub
commit 39dc937ddf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -382,7 +382,8 @@ public class Portal {
if (cooldown.get(player.getName()) != null) {
int diff = (int) ((System.currentTimeMillis() - cooldown.get(player.getName())) / 1000);
if (diff < cooldelay) {
player.sendMessage(ChatColor.RED + "Please wait " + ChatColor.YELLOW + (cooldelay - diff) + ChatColor.RED + " second(s) until attempting to enter this portal again.");
int time = (cooldelay - diff);
player.sendMessage(ChatColor.RED + "Please wait " + ChatColor.YELLOW + time + ChatColor.RED + (time == 1 ? "second" : "seconds") + " until attempting to enter this portal again.");
failSound(player, portal);
throwPlayerBack(player);
return false;