Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-03 23:17:48 +01:00
Code Issues Projects Releases Wiki Activity

Fix exception when reading map decoration with no position

Browse Source
This commit is contained in:
jglrxavpok 2020-10-16 12:35:17 +02:00
parent eda9e073d6
commit dd0f2ea293
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/net/minestom/server/item/metadata/MapMeta.java
View File

@ -117,31 +117,42 @@ public class MapMeta implements ItemMeta {
@Override
public void read(NBTCompound compound) {
if (compound.containsKey("map")) {
this.mapId = compound.getInt("map");
this.mapId = compound.getAsInt("map");
}
if (compound.containsKey("map_scale_direction")) {
this.mapScaleDirection = compound.getInt("map_scale_direction");
this.mapScaleDirection = compound.getAsInt("map_scale_direction");
}
if (compound.containsKey("Decorations")) {
final NBTList<NBTCompound> decorationsList = compound.getList("Decorations");
for (NBTCompound decorationCompound : decorationsList) {
final String id = decorationCompound.getString("id");
final byte type = decorationCompound.getByte("type");
final byte x = decorationCompound.getByte("x");
final byte z = decorationCompound.getByte("z");
final double rotation = decorationCompound.getByte("rot");
final byte type = decorationCompound.getAsByte("type");
byte x = 0;
if(decorationCompound.containsKey("x")) {
x = decorationCompound.getAsByte("x");
}
byte z = 0;
if(decorationCompound.containsKey("z")) {
z = decorationCompound.getAsByte("z");
}
double rotation = 0.0;
if(decorationCompound.containsKey("rot")) {
rotation = decorationCompound.getAsDouble("rot");
}
this.decorations.add(new MapDecoration(id, type, x, z, rotation));
}
}
if (compound.containsKey("display")) {
final NBTCompound displayCompound = compound.getCompound("display");
if (displayCompound.containsKey("MapColor")) {
final int color = displayCompound.getInt("MapColor");
final int color = displayCompound.getAsInt("MapColor");
this.mapColor = ChatColor.fromId(color);
}
}