PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Relax chat parsing to treat bytes as booleans to allow formatting read from NBT

Browse Source
This commit is contained in:
md_5 2023-12-06 21:55:56 +11:00
parent 8ce7a7f8b6
commit 231024ba42
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
chat/src/main/java/net/md_5/bungee/chat/BaseComponentSerializer.java
View File

@ -5,6 +5,7 @@ import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gson.JsonParseException; import com.google.gson.JsonParseException;
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializationContext;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -20,27 +21,51 @@ import net.md_5.bungee.api.chat.hover.content.Content;
public class BaseComponentSerializer public class BaseComponentSerializer
{ {
private static boolean getAsBoolean(JsonElement el)
{
if ( el.isJsonPrimitive() )
{
JsonPrimitive primitive = (JsonPrimitive) el;
if ( primitive.isBoolean() )
{
return primitive.getAsBoolean();
}
if ( primitive.isNumber() )
{
Number number = primitive.getAsNumber();
if ( number instanceof Byte )
{
return number.byteValue() != 0;
}
}
}
return false;
}
protected void deserialize(JsonObject object, BaseComponent component, JsonDeserializationContext context) protected void deserialize(JsonObject object, BaseComponent component, JsonDeserializationContext context)
{ {
if ( object.has( "bold" ) ) if ( object.has( "bold" ) )
{ {
component.setBold( object.get( "bold" ).getAsBoolean() ); component.setBold( getAsBoolean( object.get( "bold" ) ) );
} }
if ( object.has( "italic" ) ) if ( object.has( "italic" ) )
{ {
component.setItalic( object.get( "italic" ).getAsBoolean() ); component.setItalic( getAsBoolean( object.get( "italic" ) ) );
} }
if ( object.has( "underlined" ) ) if ( object.has( "underlined" ) )
{ {
component.setUnderlined( object.get( "underlined" ).getAsBoolean() ); component.setUnderlined( getAsBoolean( object.get( "underlined" ) ) );
} }
if ( object.has( "strikethrough" ) ) if ( object.has( "strikethrough" ) )
{ {
component.setStrikethrough( object.get( "strikethrough" ).getAsBoolean() ); component.setStrikethrough( getAsBoolean( object.get( "strikethrough" ) ) );
} }
if ( object.has( "obfuscated" ) ) if ( object.has( "obfuscated" ) )
{ {
component.setObfuscated( object.get( "obfuscated" ).getAsBoolean() ); component.setObfuscated( getAsBoolean( object.get( "obfuscated" ) ) );
} }
if ( object.has( "color" ) ) if ( object.has( "color" ) )
{ {