FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix for a strange error that didn't load expansions without `/papi reload` by wxipwastaken · Pull Request #859 · PlaceholderAPI/PlaceholderAPI · GitHub

/ PlaceholderAPI Public

Fix for a strange error that didn't load expansions without /papi reload #859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wxipwastaken wants to merge 4 commits into
base: master
Choose a base branch
Could not load branches
Branch not found: {{ refName }}

Are you sure you want to change the base?

Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
from
+42 −36
Conversation 2 Commits 4 Checks 0 Files changed 1
Open

Fix for a strange error that didn't load expansions without /papi reload #859

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c9cf609
Added a 1 second delay to fix a mysterious bug that didn't allow expa…
Jul 18, 2022
d3a1ad1
Revert "Added a 1 second delay to fix a mysterious bug that didn't al…
Jul 18, 2022
9b22192
Added a 1 second delay to fix a mysterious bug that didn't allow expa…
Jul 18, 2022
545f7f0
Changed the delay of mine fix
Jul 18, 2022
File filter

Filter by extension

Filter by extension .java  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
78 changes: 42 additions & 36 deletions src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.scheduler.BukkitRunnable;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -336,43 +337,48 @@ public boolean unregister(@NotNull final PlaceholderExpansion expansion) {
private void registerAll(@NotNull final CommandSender sender) {
Msg.info("Placeholder expansion registration initializing...");

Futures.onMainThread(plugin, findExpansionsOnDisk(), (classes, exception) -> {
if (exception != null) {
Msg.severe("Failed to load class files of expansion.", exception);
return;
}

final List<PlaceholderExpansion> registered = classes.stream()
.filter(Objects::nonNull)
.map(this::register)
.filter(Optional::isPresent)
.map(Optional::get)
.collect(Collectors.toList());

final long needsUpdate = registered.stream()
.map(expansion -> plugin.getCloudExpansionManager().findCloudExpansionByName(expansion.getName()).orElse(null))
.filter(Objects::nonNull)
.filter(CloudExpansion::shouldUpdate)
.count();

StringBuilder message = new StringBuilder(registered.size() == 0 ? "&6" : "&a")
.append(registered.size())
.append(' ')
.append("placeholder hook(s) registered!");

if (needsUpdate > 0) {
message.append(' ')
.append("&6")
.append(needsUpdate)
.append(' ')
.append("placeholder hook(s) have an update available.");
}


Msg.msg(sender, message.toString());
new BukkitRunnable() {
@Override
public void run() {
Futures.onMainThread(plugin, findExpansionsOnDisk(), (classes, exception) -> {
if (exception != null) {
Msg.severe("Failed to load class files of expansion.", exception);
return;
}

Bukkit.getPluginManager().callEvent(new ExpansionsLoadedEvent(registered));
});
final List<PlaceholderExpansion> registered = classes.stream()
.filter(Objects::nonNull)
.map(LocalExpansionManager.this::register)
.filter(Optional::isPresent)
.map(Optional::get)
.collect(Collectors.toList());

final long needsUpdate = registered.stream()
.map(expansion -> plugin.getCloudExpansionManager().findCloudExpansionByName(expansion.getName()).orElse(null))
.filter(Objects::nonNull)
.filter(CloudExpansion::shouldUpdate)
.count();

StringBuilder message = new StringBuilder(registered.size() == 0 ? "&6" : "&a")
.append(registered.size())
.append(' ')
.append("placeholder hook(s) registered!");

if (needsUpdate > 0) {
message.append(' ')
.append("&6")
.append(needsUpdate)
.append(' ')
.append("placeholder hook(s) have an update available.");
}


Msg.msg(sender, message.toString());

Bukkit.getPluginManager().callEvent(new ExpansionsLoadedEvent(registered));
});
}
}.runTaskLater(plugin, 1L);
}

private void unregisterAll() {
Expand Down
Back | FazBrowse Home | New Git URL