From 8bda04958090c301cc6cead58553553195c344f8 Mon Sep 17 00:00:00 2001 From: booky10 Date: Thu, 2 Oct 2025 13:47:28 +0200 Subject: [PATCH 1/4] Update repository ids in readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e7588d1..a905224 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ A hosted version of the javadoc can be found [here](https://mapengine.finndohrma - tjcserver + minceraft https://repo.minceraft.dev/releases/ @@ -106,7 +106,7 @@ A hosted version of the javadoc can be found [here](https://mapengine.finndohrma repositories { maven { url = 'https://repo.minceraft.dev/releases/' - name = 'tjcserver' + name = 'minceraft' } } @@ -123,7 +123,7 @@ dependencies { ```kotlin repositories { maven("https://repo.minceraft.dev/releases/") { - name = "tjcserver" + name = "minceraft" } } From d860eeea19113d771ac930db8074bf5df221866b Mon Sep 17 00:00:00 2001 From: booky10 Date: Thu, 2 Oct 2025 13:58:25 +0200 Subject: [PATCH 2/4] Follow redirects in update checker --- .../pianoman911/mapengine/core/updater/MapEngineUpdater.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugin/src/main/java/de/pianoman911/mapengine/core/updater/MapEngineUpdater.java b/plugin/src/main/java/de/pianoman911/mapengine/core/updater/MapEngineUpdater.java index 87f16be..c0f6846 100644 --- a/plugin/src/main/java/de/pianoman911/mapengine/core/updater/MapEngineUpdater.java +++ b/plugin/src/main/java/de/pianoman911/mapengine/core/updater/MapEngineUpdater.java @@ -29,7 +29,9 @@ public final class MapEngineUpdater implements Listener { - private static final HttpClient HTTP_CLIENT = HttpClient.newHttpClient(); + private static final HttpClient HTTP_CLIENT = HttpClient.newBuilder() + .followRedirects(HttpClient.Redirect.NORMAL) + .build(); private static final Gson GSON = new Gson(); private static final Component PREFIX = Component.text() .append(Component.text('[', NamedTextColor.GRAY)) From 111cfaeaa83427899e1ca0058f8e3153217ab7ea Mon Sep 17 00:00:00 2001 From: booky10 Date: Thu, 2 Oct 2025 14:05:11 +0200 Subject: [PATCH 3/4] Support second configuration phase --- .../mapengine/common/Paper1216Platform.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/platform-paper-1.21.6/src/main/java/de/pianoman911/mapengine/common/Paper1216Platform.java b/platform-paper-1.21.6/src/main/java/de/pianoman911/mapengine/common/Paper1216Platform.java index 16d9db7..7d60fc1 100755 --- a/platform-paper-1.21.6/src/main/java/de/pianoman911/mapengine/common/Paper1216Platform.java +++ b/platform-paper-1.21.6/src/main/java/de/pianoman911/mapengine/common/Paper1216Platform.java @@ -4,6 +4,7 @@ import de.pianoman911.mapengine.common.platform.IListenerBridge; import de.pianoman911.mapengine.common.platform.IPlatform; import de.pianoman911.mapengine.common.platform.PacketContainer; +import io.netty.channel.Channel; import io.papermc.paper.adventure.PaperAdventure; import it.unimi.dsi.fastutil.ints.IntList; import net.minecraft.SharedConstants; @@ -37,6 +38,7 @@ 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.map.MapCursor; import org.bukkit.map.MapCursorCollection; import org.bukkit.plugin.Plugin; @@ -81,6 +83,19 @@ public void onJoin(PlayerJoinEvent event) { .pipeline().addAfter("decoder", "mapengine", listener); } + @EventHandler + public void onQuit(PlayerQuitEvent event) { + // remove mapengine pipeline handler if the player is still connected + // while this event is being fired; this prevents errors if the player goes + // through a second configuration phase + Channel ch = ((CraftPlayer) event.getPlayer()).getHandle().connection.connection.channel; + ch.eventLoop().execute(() -> { + if (ch.isActive()) { + ch.pipeline().remove("mapengine"); + } + }); + } + @Override public String getDisplayedName() { return MinecraftServer.getServer().getServerModName() From feb1d5180706b4ea52d5fa703eb2d0096c17bac5 Mon Sep 17 00:00:00 2001 From: booky10 Date: Thu, 2 Oct 2025 14:07:19 +0200 Subject: [PATCH 4/4] Mark 1.21.9 as supported --- .../de/pianoman911/mapengine/common/Paper1216Provider.java | 5 +++-- plugin/build.gradle.kts | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/platform-paper-1.21.6/src/main/java/de/pianoman911/mapengine/common/Paper1216Provider.java b/platform-paper-1.21.6/src/main/java/de/pianoman911/mapengine/common/Paper1216Provider.java index 2184dfc..41a38ad 100755 --- a/platform-paper-1.21.6/src/main/java/de/pianoman911/mapengine/common/Paper1216Provider.java +++ b/platform-paper-1.21.6/src/main/java/de/pianoman911/mapengine/common/Paper1216Provider.java @@ -12,8 +12,9 @@ public final class Paper1216Provider implements IPlatformProvider { private static final IntSet SUPPORTED_PROTOCOLS = IntSet.of( - 771, // 1.21.6 - 772 // 1.21.7 + 771, // 1.21.6 + 772, // 1.21.7 + 773 // 1.21.9 ); @SuppressWarnings("deprecation") // bukkit unsafe diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 3a488a2..477a0fe 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -74,7 +74,7 @@ tasks { runServer { runDirectory = rootProject.layout.projectDirectory.dir("run") - minecraftVersion("1.21.6") + minecraftVersion("1.21.9") } }