diff --git a/src/main/java/com/comphenix/protocol/injector/netty/ProtocolInjector.java b/src/main/java/com/comphenix/protocol/injector/netty/ProtocolInjector.java index f27ed241..146879e9 100644 --- a/src/main/java/com/comphenix/protocol/injector/netty/ProtocolInjector.java +++ b/src/main/java/com/comphenix/protocol/injector/netty/ProtocolInjector.java @@ -297,9 +297,7 @@ public class ProtocolInjector implements ChannelListener { PacketContainer container = new PacketContainer(PacketRegistry.getPacketType(clazz), packet); return packetQueued(container, injector.getPlayer(), marker); } catch (LinkageError e) { - // So far this has been seen when the jar is shared - System.err.println("[ProtocolLib] Encountered a LinkageError. Make sure you\'re not using this jar for multiple server instances!"); - System.err.println("[ProtocolLib] If you\'re getting this error for other reasons, please report it!"); + System.err.println("[ProtocolLib] Encountered a LinkageError (likely a misbehaving wrapper), please report this!"); e.printStackTrace(); } } diff --git a/src/main/java/com/comphenix/protocol/reflect/cloning/BukkitCloner.java b/src/main/java/com/comphenix/protocol/reflect/cloning/BukkitCloner.java index e7cd79bc..2ddf8123 100644 --- a/src/main/java/com/comphenix/protocol/reflect/cloning/BukkitCloner.java +++ b/src/main/java/com/comphenix/protocol/reflect/cloning/BukkitCloner.java @@ -47,7 +47,7 @@ public class BukkitCloner implements Cloner { if (nmsClass != null) { CLONERS.put(nmsClass, nmsObject -> fromHandle.apply(nmsObject).deepClone().getHandle()); } - } catch (RuntimeException ignored) { } + } catch (Throwable ignored) { } } @SuppressWarnings({"unchecked", "rawtypes"}) @@ -57,7 +57,7 @@ public class BukkitCloner implements Cloner { if (nmsClass != null) { CLONERS.put(nmsClass, nmsObject -> converter.getGeneric(converter.getSpecific(nmsObject))); } - } catch (RuntimeException ignored) { } + } catch (Throwable ignored) { } } private static void fromManual(Supplier> getClass, Function cloner) { @@ -66,7 +66,7 @@ public class BukkitCloner implements Cloner { if (nmsClass != null) { CLONERS.put(nmsClass, cloner); } - } catch (RuntimeException ignored) { } + } catch (Throwable ignored) { } } static {