Skip to content
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

Fixed NoSuchMethodException when running tests on Spigot (Closes #7553) #7558

Open
wants to merge 7 commits into
base: dev/patch
Choose a base branch
from
+2 −2
Open

Fixed NoSuchMethodException when running tests on Spigot (Closes #7553) #7558

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b4c98ec
Added spigot semi-equivalent of the "get chunk at async" method.
JakeGBLP Jan 30, 2025
49cc66d
Removed listening code as 'getChunkAt' is called synchronously.
JakeGBLP Jan 30, 2025
b92b6e2
Removed unused imports.
JakeGBLP Jan 30, 2025
655b9e9
Switched to PaperLib method that handles chunk loading.
JakeGBLP Jan 30, 2025
ce54414
Removed accidental boolean negation.
JakeGBLP Jan 30, 2025
2ade269
Added requested changes
JakeGBLP Jan 31, 2025
ceeb29e
Merge branch 'dev/patch' into dev/patch
Efnilite Feb 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions src/main/java/ch/njol/skript/Skript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import ch.njol.util.StringUtils;
import ch.njol.util.coll.iterator.CheckedIterator;
import ch.njol.util.coll.iterator.EnumerationIterable;
import com.google.common.collect.Lists;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import org.bstats.bukkit.Metrics;
Expand All @@ -60,6 +59,8 @@
import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.event.server.ServerCommandEvent;
import org.bukkit.event.server.ServerLoadEvent;
import org.bukkit.event.world.ChunkLoadEvent;
import org.bukkit.event.world.WorldLoadEvent;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginDescriptionFile;
import org.bukkit.plugin.java.JavaPlugin;
Expand Down Expand Up @@ -125,6 +126,8 @@
import java.util.zip.ZipException;
import java.util.zip.ZipFile;

import static io.papermc.lib.PaperLib.isPaper;

// TODO meaningful error if someone uses an %expression with percent signs% outside of text or a variable

/**
Expand Down Expand Up @@ -683,7 +686,22 @@ protected void afterErrors() {
if (TestMode.DEV_MODE) {
runTests(); // Dev mode doesn't need a delay
} else {
Bukkit.getWorlds().get(0).getChunkAtAsync(100, 100).thenRun(() -> runTests());
World world = Bukkit.getWorlds().get(0);
if (isPaper())
world.getChunkAtAsync(100, 100).thenRun(() -> runTests());
else {
Bukkit.getServer().getPluginManager().registerEvents(new Listener() {
@EventHandler
public void onChunkLoad(ChunkLoadEvent event) {
Chunk chunk = event.getChunk();
if (chunk.getX() == 100 && chunk.getZ() == 100) {
runTests();
event.getHandlers().unregister(this);
}
}
}, Skript.getInstance());
world.getChunkAt(100, 100);
JakeGBLP marked this conversation as resolved.
Show resolved Hide resolved
}
}
}

Expand Down