Google/Geyser
1
0
Fork 0
forked from GeyserMC/Geyser
Code Issues Pull requests Projects Releases Wiki Activity

Check if firework item explosions tag is null (#626)

Browse source
This commit is contained in:
Camotoy 2020-05-23 21:16:11 -04:00 committed by GitHub
parent a49f6fe0e3
commit fe6257bb38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/FireworkTranslator.java
View file

@ -39,49 +39,51 @@ public class FireworkTranslator extends NbtItemStackTranslator {
CompoundTag fireworks = itemTag.get("Fireworks"); CompoundTag fireworks = itemTag.get("Fireworks");
ListTag explosions = fireworks.get("Explosions"); ListTag explosions = fireworks.get("Explosions");
for (Tag effect : explosions.getValue()) { if (explosions != null) {
CompoundTag effectData = (CompoundTag) effect; for (Tag effect : explosions.getValue()) {
CompoundTag effectData = (CompoundTag) effect;
CompoundTag newEffectData = new CompoundTag(""); CompoundTag newEffectData = new CompoundTag("");
if (effectData.get("Type") != null) { if (effectData.get("Type") != null) {
newEffectData.put(new ByteTag("FireworkType", (Byte) effectData.get("Type").getValue())); newEffectData.put(new ByteTag("FireworkType", (Byte) effectData.get("Type").getValue()));
}
if (effectData.get("Colors") != null) {
int[] oldColors = (int[]) effectData.get("Colors").getValue();
byte[] colors = new byte[oldColors.length];
int i = 0;
for (int color : oldColors) {
colors[i++] = FireworkColor.fromJavaID(color).getBedrockID();
} }
newEffectData.put(new ByteArrayTag("FireworkColor", colors)); if (effectData.get("Colors") != null) {
} int[] oldColors = (int[]) effectData.get("Colors").getValue();
byte[] colors = new byte[oldColors.length];
if (effectData.get("FadeColors") != null) { int i = 0;
int[] oldColors = (int[]) effectData.get("FadeColors").getValue(); for (int color : oldColors) {
byte[] colors = new byte[oldColors.length]; colors[i++] = FireworkColor.fromJavaID(color).getBedrockID();
}
int i = 0; newEffectData.put(new ByteArrayTag("FireworkColor", colors));
for (int color : oldColors) {
colors[i++] = FireworkColor.fromJavaID(color).getBedrockID();
} }
newEffectData.put(new ByteArrayTag("FireworkFade", colors)); if (effectData.get("FadeColors") != null) {
} int[] oldColors = (int[]) effectData.get("FadeColors").getValue();
byte[] colors = new byte[oldColors.length];
if (effectData.get("Trail") != null) { int i = 0;
newEffectData.put(new ByteTag("FireworkTrail", (Byte) effectData.get("Trail").getValue())); for (int color : oldColors) {
} colors[i++] = FireworkColor.fromJavaID(color).getBedrockID();
}
if (effectData.get("Flicker") != null) { newEffectData.put(new ByteArrayTag("FireworkFade", colors));
newEffectData.put(new ByteTag("FireworkFlicker", (Byte) effectData.get("Flicker").getValue())); }
}
explosions.remove(effect); if (effectData.get("Trail") != null) {
explosions.add(newEffectData); newEffectData.put(new ByteTag("FireworkTrail", (Byte) effectData.get("Trail").getValue()));
}
if (effectData.get("Flicker") != null) {
newEffectData.put(new ByteTag("FireworkFlicker", (Byte) effectData.get("Flicker").getValue()));
}
explosions.remove(effect);
explosions.add(newEffectData);
}
} }
} }