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

Jump to bottom

Force usage of plugin classloader to lookup classes of other plugins #1004

Merged
merged 2 commits into from
Sep 24, 2024
Merged

Force usage of plugin classloader to lookup classes of other plugins #1004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c733b3
Force usage of plugin classloader to lookup classes of other plugins
booky10 Sep 21, 2024
90bd184
Revert unused import
booky10 Sep 23, 2024
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
7 changes: 5 additions & 2 deletions spigot/src/main/java/io/github/retrooper/packetevents/util/GeyserUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package io.github.retrooper.packetevents.util;

import com.github.retrooper.packetevents.PacketEvents;
import com.github.retrooper.packetevents.util.reflection.Reflection;

import java.lang.reflect.InvocationTargetException;
Expand All @@ -35,7 +36,8 @@ public class GeyserUtil {
public static boolean isGeyserPlayer(UUID uuid) {
if (!CHECKED_FOR_GEYSER) {
try {
GEYSER_CLASS = Class.forName("org.geysermc.api.Geyser");
ClassLoader classLoader = PacketEvents.getAPI().getPlugin().getClass().getClassLoader();
GEYSER_CLASS = classLoader.loadClass("org.geysermc.api.Geyser");
GEYSER_PRESENT = true;
} catch (ClassNotFoundException e) {
GEYSER_PRESENT = false;
Expand All @@ -46,7 +48,8 @@ public static boolean isGeyserPlayer(UUID uuid) {
if (GEYSER_PRESENT) {
if (GEYSER_API_CLASS == null) {
try {
GEYSER_API_CLASS = Class.forName("org.geysermc.api.GeyserApiBase");
ClassLoader classLoader = PacketEvents.getAPI().getPlugin().getClass().getClassLoader();
GEYSER_API_CLASS = classLoader.loadClass("org.geysermc.api.GeyserApiBase");
}
catch (ClassNotFoundException e) {
e.printStackTrace();
Expand Down
4 changes: 3 additions & 1 deletion .../main/java/io/github/retrooper/packetevents/util/protocolsupport/ProtocolSupportUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package io.github.retrooper.packetevents.util.protocolsupport;

import com.github.retrooper.packetevents.PacketEvents;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import protocolsupport.api.ProtocolSupportAPI;
Expand All @@ -30,7 +31,8 @@ public class ProtocolSupportUtil {
public static boolean isAvailable() {
if (available == ProtocolSupportState.UNKNOWN) {
try {
Class.forName("protocolsupport.api.ProtocolSupportAPI");
ClassLoader classLoader = PacketEvents.getAPI().getPlugin().getClass().getClassLoader();
classLoader.loadClass("protocolsupport.api.ProtocolSupportAPI");
available = ProtocolSupportState.ENABLED;
return true;
} catch (Exception e) {
Expand Down
12 changes: 7 additions & 5 deletions ...n/java/io/github/retrooper/packetevents/util/viaversion/ViaVersionAccessorImplLegacy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,12 @@ public class ViaVersionAccessorImplLegacy implements ViaVersionAccessor {
private void load() {
if (viaClass == null) {
try {
viaClass = Class.forName("us.myles.ViaVersion.api.Via");
ClassLoader classLoader = PacketEvents.getAPI().getPlugin().getClass().getClassLoader();
viaClass = classLoader.loadClass("us.myles.ViaVersion.api.Via");
viaManagerField = viaClass.getDeclaredField("manager");
bukkitDecodeHandlerClass = Class.forName("us.myles.ViaVersion.bukkit.handlers.BukkitDecodeHandler");
bukkitEncodeHandlerClass = Class.forName("us.myles.ViaVersion.bukkit.handlers.BukkitEncodeHandler");
Class<?> viaAPIClass = Class.forName("us.myles.ViaVersion.api.ViaAPI");
bukkitDecodeHandlerClass = classLoader.loadClass("us.myles.ViaVersion.bukkit.handlers.BukkitDecodeHandler");
bukkitEncodeHandlerClass = classLoader.loadClass("us.myles.ViaVersion.bukkit.handlers.BukkitEncodeHandler");
Class<?> viaAPIClass = classLoader.loadClass("us.myles.ViaVersion.api.ViaAPI");
apiAccessor = viaClass.getMethod("getAPI");
getPlayerVersionMethod = viaAPIClass.getMethod("getPlayerVersion", Object.class);
} catch (ClassNotFoundException | NoSuchMethodException | NoSuchFieldException e) {
Expand All @@ -56,7 +57,8 @@ private void load() {

if (userConnectionClass == null) {
try {
userConnectionClass = Class.forName("us.myles.ViaVersion.api.data.UserConnection");
ClassLoader classLoader = PacketEvents.getAPI().getPlugin().getClass().getClassLoader();
userConnectionClass = classLoader.loadClass("us.myles.ViaVersion.api.data.UserConnection");
} catch (ClassNotFoundException e) {
e.printStackTrace();
}
Expand Down
6 changes: 4 additions & 2 deletions spigot/src/main/java/io/github/retrooper/packetevents/util/viaversion/ViaVersionUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package io.github.retrooper.packetevents.util.viaversion;

import com.github.retrooper.packetevents.PacketEvents;
import com.github.retrooper.packetevents.protocol.player.User;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
Expand All @@ -31,12 +32,13 @@ private ViaVersionUtil() {

private static void load() {
if (viaVersionAccessor == null) {
ClassLoader classLoader = PacketEvents.getAPI().getPlugin().getClass().getClassLoader();
try {
Class.forName("com.viaversion.viaversion.api.Via");
classLoader.loadClass("com.viaversion.viaversion.api.Via");
viaVersionAccessor = new ViaVersionAccessorImpl();
} catch (Exception e) {
try {
Class.forName("us.myles.ViaVersion.api.Via");
classLoader.loadClass("us.myles.ViaVersion.api.Via");
viaVersionAccessor = new ViaVersionAccessorImplLegacy();
} catch (ClassNotFoundException ex) {
viaVersionAccessor = null;
Expand Down