Fix yet another build
This commit is contained in:
parent
9b7139a17a
commit
bc4cb5046d
@ -49,9 +49,9 @@ class LimboPlayerTaskManager {
|
|||||||
*/
|
*/
|
||||||
void registerMessageTask(Player player, LimboPlayer limbo, boolean isRegistered) {
|
void registerMessageTask(Player player, LimboPlayer limbo, boolean isRegistered) {
|
||||||
int interval = settings.getProperty(RegistrationSettings.MESSAGE_INTERVAL);
|
int interval = settings.getProperty(RegistrationSettings.MESSAGE_INTERVAL);
|
||||||
MessageResult messageResult = getMessageKey(player.getName(), isRegistered);
|
MessageResult result = getMessageKey(player.getName(), isRegistered);
|
||||||
if (interval > 0) {
|
if (interval > 0) {
|
||||||
String[] joinMessage = messages.retrieveSingle(messageResult.messageKey, player, messageResult.args).split("\n");
|
String[] joinMessage = messages.retrieveSingle(result.messageKey, player, result.args).split("\n");
|
||||||
MessageTask messageTask = new MessageTask(player, joinMessage);
|
MessageTask messageTask = new MessageTask(player, joinMessage);
|
||||||
bukkitService.runTaskTimer(messageTask, 2 * TICKS_PER_SECOND, interval * TICKS_PER_SECOND);
|
bukkitService.runTaskTimer(messageTask, 2 * TICKS_PER_SECOND, interval * TICKS_PER_SECOND);
|
||||||
limbo.setMessageTask(messageTask);
|
limbo.setMessageTask(messageTask);
|
||||||
|
|||||||
@ -116,7 +116,7 @@ public class Messages {
|
|||||||
* @return The message from the file
|
* @return The message from the file
|
||||||
*/
|
*/
|
||||||
private String retrieveMessage(MessageKey key, CommandSender sender) {
|
private String retrieveMessage(MessageKey key, CommandSender sender) {
|
||||||
String message = messagesFileHandler.getMessage(key.getKey());
|
String message = messagesFileHandler.getMessage(key.getKey());
|
||||||
String displayName = sender.getName();
|
String displayName = sender.getName();
|
||||||
if (sender instanceof Player) {
|
if (sender instanceof Player) {
|
||||||
displayName = ((Player) sender).getDisplayName();
|
displayName = ((Player) sender).getDisplayName();
|
||||||
|
|||||||
@ -64,6 +64,7 @@ public class CommonService {
|
|||||||
* Retrieves a message in one piece.
|
* Retrieves a message in one piece.
|
||||||
*
|
*
|
||||||
* @param key the key of the message
|
* @param key the key of the message
|
||||||
|
* @param sender The entity to send the message to
|
||||||
* @return the message
|
* @return the message
|
||||||
*/
|
*/
|
||||||
public String retrieveSingleMessage(MessageKey key, CommandSender sender) {
|
public String retrieveSingleMessage(MessageKey key, CommandSender sender) {
|
||||||
|
|||||||
@ -141,6 +141,7 @@ public class MessagesIntegrationTest {
|
|||||||
MessageKey key = MessageKey.LOGIN_SUCCESS;
|
MessageKey key = MessageKey.LOGIN_SUCCESS;
|
||||||
Player player = Mockito.mock(Player.class);
|
Player player = Mockito.mock(Player.class);
|
||||||
given(player.getName()).willReturn("Tester");
|
given(player.getName()).willReturn("Tester");
|
||||||
|
given(player.getDisplayName()).willReturn("§cTesty");
|
||||||
|
|
||||||
// when
|
// when
|
||||||
messages.send(player, key);
|
messages.send(player, key);
|
||||||
@ -155,6 +156,7 @@ public class MessagesIntegrationTest {
|
|||||||
MessageKey key = MessageKey.UNKNOWN_USER;
|
MessageKey key = MessageKey.UNKNOWN_USER;
|
||||||
Player player = Mockito.mock(Player.class);
|
Player player = Mockito.mock(Player.class);
|
||||||
given(player.getName()).willReturn("Tester");
|
given(player.getName()).willReturn("Tester");
|
||||||
|
given(player.getDisplayName()).willReturn("§cTesty");
|
||||||
|
|
||||||
// when
|
// when
|
||||||
messages.send(player, key);
|
messages.send(player, key);
|
||||||
@ -172,12 +174,13 @@ public class MessagesIntegrationTest {
|
|||||||
MessageKey key = MessageKey.REGISTER_MESSAGE;
|
MessageKey key = MessageKey.REGISTER_MESSAGE;
|
||||||
Player player = Mockito.mock(Player.class);
|
Player player = Mockito.mock(Player.class);
|
||||||
given(player.getName()).willReturn("Tester");
|
given(player.getName()).willReturn("Tester");
|
||||||
|
given(player.getDisplayName()).willReturn("§cTesty");
|
||||||
|
|
||||||
// when
|
// when
|
||||||
messages.send(player, key);
|
messages.send(player, key);
|
||||||
|
|
||||||
// then
|
// then
|
||||||
verify(player).sendMessage("§3Please Tester, register to the server with the command: /register <password> <ConfirmPassword>");
|
verify(player).sendMessage("§3Please Tester, register to the §cTesty§3.");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
error:
|
error:
|
||||||
unregistered_user: 'We''ve got%nl%new lines%nl%and '' apostrophes'
|
unregistered_user: 'We''ve got%nl%new lines%nl%and '' apostrophes'
|
||||||
registration:
|
registration:
|
||||||
register_request: '&3Please %username%, register to the server with the command: /register <password> <ConfirmPassword>'
|
register_request: '&3Please %username%, register to the %displayname%&3.'
|
||||||
login:
|
login:
|
||||||
success: '&cHere we have&bdefined some colors &dand some other <hings'
|
success: '&cHere we have&bdefined some colors &dand some other <hings'
|
||||||
wrong_password: '&cWrong password!'
|
wrong_password: '&cWrong password!'
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user