From baf6a417002a1a1932c59550e605af2821c069d1 Mon Sep 17 00:00:00 2001 From: SamB440 Date: Sun, 10 Oct 2021 17:08:28 +0100 Subject: [PATCH] Fix fadein resetting wrongly during title animation --- .../rpgregions/utils/TitleAnimator.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/api/src/main/java/net/islandearth/rpgregions/utils/TitleAnimator.java b/api/src/main/java/net/islandearth/rpgregions/utils/TitleAnimator.java index a3cf422..3d0ec2e 100644 --- a/api/src/main/java/net/islandearth/rpgregions/utils/TitleAnimator.java +++ b/api/src/main/java/net/islandearth/rpgregions/utils/TitleAnimator.java @@ -27,17 +27,22 @@ public class TitleAnimator { } plugin.debug("Successful title send!"); + int fadein = plugin.getConfig().getInt("settings.server.discoveries.discovered.title.fadein"); + if (current >= 1) { + fadein = 0; + final String animationSound = plugin.getConfig().getString("settings.server.discoveries.discovered.title.animation_sound", Sound.BLOCK_TRIPWIRE_CLICK_ON.name()); + final int animationSoundPitch = plugin.getConfig().getInt("settings.server.discoveries.discovered.title.animation_sound_pitch", 1); + if (current >= 1) { + final Sound sound = Sound.valueOf(animationSound.toUpperCase(Locale.ROOT)); + player.playSound(player.getLocation(), sound, 1f, animationSoundPitch); + } + } + player.sendTitle(title, subtitle, - plugin.getConfig().getInt("settings.server.discoveries.discovered.title.fadein"), + fadein, plugin.getConfig().getInt("settings.server.discoveries.discovered.title.stay"), plugin.getConfig().getInt("settings.server.discoveries.discovered.title.fadeout")); - final String animationSound = plugin.getConfig().getString("settings.server.discoveries.discovered.title.animation_sound", Sound.BLOCK_TRIPWIRE_CLICK_ON.name()); - final int animationSoundPitch = plugin.getConfig().getInt("settings.server.discoveries.discovered.title.animation_sound_pitch", 1); - if (current >= 1) { - final Sound sound = Sound.valueOf(animationSound.toUpperCase(Locale.ROOT)); - player.playSound(player.getLocation(), sound, 1f, animationSoundPitch); - } current++; }