OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-12-23 15:00:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix Geyser booting on Spigot 1.19

Browse source
This commit is contained in:
Camotoy 2022-06-07 14:46:59 -04:00
parent 2595eae300
commit 5a1e6a6d08
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bootstrap/spigot/pom.xml
View file

@ -116,6 +116,12 @@
<pattern>me.lucko.commodore</pattern> <pattern>me.lucko.commodore</pattern>
<shadedPattern>org.geysermc.geyser.platform.spigot.shaded.commodore</shadedPattern> <shadedPattern>org.geysermc.geyser.platform.spigot.shaded.commodore</shadedPattern>
</relocation> </relocation>
<relocation>
<!-- This is not used because relocating breaks natives, but we must include it
or else we get ClassDefNotFound after 1.18.2 -->
<pattern>io.netty.channel.kqueue</pattern>
<shadedPattern>org.geysermc.geyser.platform.spigot.shaded.io.netty.channel.kqueue</shadedPattern>
</relocation>
</relocations> </relocations>
</configuration> </configuration>
</execution> </execution>
@ -129,7 +135,6 @@
<!-- Needed because older Spigot builds do not provide the haproxy module --> <!-- Needed because older Spigot builds do not provide the haproxy module -->
<exclude>io.netty:netty-transport-native-epoll:*</exclude> <exclude>io.netty:netty-transport-native-epoll:*</exclude>
<exclude>io.netty:netty-transport-native-unix-common:*</exclude> <exclude>io.netty:netty-transport-native-unix-common:*</exclude>
<exclude>io.netty:netty-transport-native-kqueue:*</exclude>
<exclude>io.netty:netty-handler:*</exclude> <exclude>io.netty:netty-handler:*</exclude>
<exclude>io.netty:netty-common:*</exclude> <exclude>io.netty:netty-common:*</exclude>
<exclude>io.netty:netty-buffer:*</exclude> <exclude>io.netty:netty-buffer:*</exclude>

9
bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java
View file

@ -29,6 +29,7 @@ import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.data.MappingData; import com.viaversion.viaversion.api.data.MappingData;
import com.viaversion.viaversion.api.protocol.ProtocolPathEntry; import com.viaversion.viaversion.api.protocol.ProtocolPathEntry;
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import io.netty.buffer.ByteBuf;
import me.lucko.commodore.CommodoreProvider; import me.lucko.commodore.CommodoreProvider;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.PluginCommand; import org.bukkit.command.PluginCommand;
@ -108,11 +109,9 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap {
} }
try { try {
// Required for the Cloudburst Network dependency to initialize. // AvailableCommandsSerializer_v291 complains otherwise
Class.forName("io.netty.channel.kqueue.KQueue"); ByteBuf.class.getMethod("writeShortLE", int.class);
} catch (ClassNotFoundException e) { } catch (NoSuchMethodException e) {
// While we could support these older versions, the downside is not having KQueue working at all
// And since there are alternative ways to get Geyser working for these aging platforms, it's not worth it.
getLogger().severe("*********************************************"); getLogger().severe("*********************************************");
getLogger().severe(""); getLogger().severe("");
getLogger().severe(GeyserLocale.getLocaleStringLog("geyser.bootstrap.unsupported_server.header")); getLogger().severe(GeyserLocale.getLocaleStringLog("geyser.bootstrap.unsupported_server.header"));