Skip to content
This repository has been archived by the owner on Oct 16, 2024. It is now read-only.

Commit

Permalink
Try to fix loading resource pack too early
Browse files Browse the repository at this point in the history
  • Loading branch information
EsotericEnderman committed Sep 3, 2024
1 parent fa94812 commit 2815127
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ val topLevelDomain = "net"
val projectNameString = rootProject.name

group = topLevelDomain + groupStringSeparator + mainProjectAuthor.lowercase() + groupStringSeparator + snakecase(projectNameString)
version = "0.0.7"
version = "0.0.8"

val buildDirectoryString = buildDir.toString()

Expand Down
39 changes: 38 additions & 1 deletion src/main/java/net/slqmy/title_plugin/TitlePlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.player.PlayerResourcePackStatusEvent;
import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.scheduler.BukkitRunnable;
import org.checkerframework.checker.nullness.qual.NonNull;
Expand All @@ -17,12 +20,16 @@
import net.md_5.bungee.api.ChatColor;

import java.util.List;
import java.util.ArrayList;
import java.util.stream.Stream;
import java.util.UUID;
import java.time.Duration;

@DefaultQualifier(NonNull.class)
public final class TitlePlugin extends JavaPlugin implements Listener {

private final List<UUID> alreadySentTitlePlayers = new ArrayList<>();;

private Component titleComponent;
private List<TextComponent> changingSubtitleComponents;
private long secondsBeforeChanging;
Expand Down Expand Up @@ -50,8 +57,38 @@ public void onEnable() {
fadeOutTime = configuration.getLong("fade-out-time", 0L);
}

@EventHandler
public void onResourcePackLoad(PlayerJoinEvent event) {
new TitleRunnable(this, event.getPlayer());
Player player = event.getPlayer();
UUID playerUuid = player.getUniqueId();

if (alreadySentTitlePlayers.contains(playerUuid)) {
return;
}

new TitleRunnable(this, player);

alreadySentTitlePlayers.add(playerUuid);
}

@EventHandler
public void onResourcePackLoad(PlayerResourcePackStatusEvent event) {
Player player = event.getPlayer();
UUID playerUuid = player.getUniqueId();

if (alreadySentTitlePlayers.contains(playerUuid)) {
return;
}

if (event.getStatus() == PlayerResourcePackStatusEvent.Status.SUCCESSFULLY_LOADED) {
new TitleRunnable(this, player);
alreadySentTitlePlayers.add(playerUuid);
}
}

@EventHandler
public void onQuit(PlayerQuitEvent event) {
alreadySentTitlePlayers.remove(event.getPlayer().getUniqueId());
}

private final class TitleRunnable extends BukkitRunnable {
Expand Down

0 comments on commit 2815127

Please sign in to comment.