From 3b71a2b5701a3cbd0273a4e04bb852d0098e7930 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Sun, 13 Apr 2014 00:07:11 +0100
Subject: [PATCH] Fix ping decoding (Fixes #969)

---
 proxy/src/main/java/net/md_5/bungee/PlayerInfoSerializer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proxy/src/main/java/net/md_5/bungee/PlayerInfoSerializer.java b/proxy/src/main/java/net/md_5/bungee/PlayerInfoSerializer.java
index 63a55fdd..a7b7ba43 100644
--- a/proxy/src/main/java/net/md_5/bungee/PlayerInfoSerializer.java
+++ b/proxy/src/main/java/net/md_5/bungee/PlayerInfoSerializer.java
@@ -35,7 +35,7 @@ public class PlayerInfoSerializer implements JsonSerializer<ServerPing.PlayerInf
         {
             info.setUniqueId( UUID.fromString( id ) );
         }
-        return null;
+        return info;
     }
 
     @Override