Upstream/BungeeCord
1
0
Fork 0
mirror of https://github.com/SpigotMC/BungeeCord.git synced 2024-12-26 10:37:46 +01:00
Code Issues Projects Releases Wiki Activity

Fix NPE while encoding when favicon was missing

Browse Source
This commit is contained in:
Jonas Konrad 2014-04-15 11:56:43 +02:00 committed by md_5
parent e2eba52162
commit 994a996981
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/src/main/java/net/md_5/bungee/api/Favicon.java
View File

@ -14,6 +14,7 @@ import java.io.InputStream;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;
import lombok.NonNull;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
/** /**
@ -28,13 +29,14 @@ public class Favicon
@Override @Override
public void write(JsonWriter out, Favicon value) throws IOException public void write(JsonWriter out, Favicon value) throws IOException
{ {
TypeAdapters.STRING.write( out, value.getEncoded() ); TypeAdapters.STRING.write( out, value == null ? null : value.getEncoded() );
} }
@Override @Override
public Favicon read(JsonReader in) throws IOException public Favicon read(JsonReader in) throws IOException
{ {
return create( TypeAdapters.STRING.read( in ) ); String enc = TypeAdapters.STRING.read( in );
return enc == null ? null : create( enc );
} }
}; };
@ -46,6 +48,7 @@ public class Favicon
/** /**
* The base64 encoded favicon, including MIME header. * The base64 encoded favicon, including MIME header.
*/ */
@NonNull
@Getter @Getter
private final String encoded; private final String encoded;