Merge 034f753b9c into e1255edb32

src/main/java/com/comphenix/protocol/events/SerializedOfflinePlayer.java

@@ -145,6 +145,16 @@ class SerializedOfflinePlayer implements OfflinePlayer, Serializable {
         return lastSeen;
     }
 
+	@Override
+	public Location getRespawnLocation() {
+		return null;
+	}
+
+	@Override
+	public Location getLocation() {
+		return null;
+	}
+
     // TODO do we need to implement this?
 
     public void incrementStatistic(Statistic statistic) throws IllegalArgumentException {

src/main/java/com/comphenix/protocol/injector/netty/channel/InjectionFactory.java

@@ -168,11 +168,19 @@ public class InjectionFactory {
         Object netManager = this.findNetworkManager(channel);
         Player temporaryPlayer = playerFactory.createTemporaryPlayer(this.server);
 
+        // Use the channel field from an already found network manager to prevent our channel injector given in
+        // this method from overwriting initialized custom channel implementation in some spigot forks
+        Channel wrappedChannel = FuzzyReflection.getFieldValue(netManager, Channel.class, true);
+        if (wrappedChannel == null)  {
+            // Use the channel straight from ChannelHandlerContext as fallback if the field has null value
+            wrappedChannel = channel;
+        }
+
         NettyChannelInjector injector = new NettyChannelInjector(
                 temporaryPlayer,
                 this.server,
                 netManager,
-                channel,
+                wrappedChannel,
                 listener,
                 this,
                 this.errorReporter);