From 006a7bf2772bb6ed16a471b1e0f9117119d5dc6d Mon Sep 17 00:00:00 2001 From: nossr50 Date: Wed, 30 Dec 2020 15:41:14 -0800 Subject: [PATCH] Add back missing cooldown locale message Fixes #4361 --- Changelog.txt | 1 + src/main/resources/locale/locale_en_US.properties | 1 + src/test/java/ChunkStoreTest.java | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Changelog.txt b/Changelog.txt index db1394a97..278a9f4d3 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,6 +1,7 @@ Version 2.1.165 The mcMMO system which tracks player placed blocks has had some major rewrites (thanks t00thpick1) mcMMO will now be compatible with changes to world height (1.17 compatibility) + Added missing cooldown locale message 'Commands.Database.Cooldown' NOTES: t00thpick1 has taken time to rewrite our block meta tracking system to be more efficient, easier to maintain, and support upcoming features such as world height changes diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties index e60f89a86..939132271 100644 --- a/src/main/resources/locale/locale_en_US.properties +++ b/src/main/resources/locale/locale_en_US.properties @@ -589,6 +589,7 @@ Commands.Cooldowns.Header=&6--= &amcMMO Ability Cooldowns&6 =-- Commands.Cooldowns.Row.N=\ &c{0}&f - &6{1} seconds left Commands.Cooldowns.Row.Y=\ &b{0}&f - &2Ready! Commands.Database.CooldownMS=You must wait {0} milliseconds before using this command again. +Commands.Database.Cooldown=You must wait {0} seconds before using this command again. Commands.Database.Processing=Your previous command is still being processed. Please wait. Commands.Disabled=This command is disabled. Commands.DoesNotExist= &cPlayer does not exist in the database! diff --git a/src/test/java/ChunkStoreTest.java b/src/test/java/ChunkStoreTest.java index 9d4e4995d..f45b0e0c9 100644 --- a/src/test/java/ChunkStoreTest.java +++ b/src/test/java/ChunkStoreTest.java @@ -15,7 +15,7 @@ import java.util.UUID; import static org.mockito.Mockito.mock; /** - * Could be alot better. But some tests are better than none! Tests the major things, still kinda unit-testy. Verifies that the serialization isn't completely broken. + * Could be a lot better. But some tests are better than none! Tests the major things, still kinda unit-testy. Verifies that the serialization isn't completely broken. */ @RunWith(PowerMockRunner.class) @PrepareForTest(Bukkit.class)