Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-7212: Allow negative firework power

Browse Source
This commit is contained in:
md_5 2022-12-23 11:46:35 +11:00
parent 909a246afc
commit 0a1c89e4b1
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java
View File

@ -53,7 +53,7 @@ class CraftMetaFirework extends CraftMetaItem implements FireworkMeta {
static final ItemMetaKey EXPLOSION_FADE = new ItemMetaKey("FadeColors"); static final ItemMetaKey EXPLOSION_FADE = new ItemMetaKey("FadeColors");
private List<FireworkEffect> effects; private List<FireworkEffect> effects;
private int power; private Integer power;
CraftMetaFirework(CraftMetaItem meta) { CraftMetaFirework(CraftMetaItem meta) {
super(meta); super(meta);
@ -80,7 +80,7 @@ class CraftMetaFirework extends CraftMetaItem implements FireworkMeta {
NBTTagCompound fireworks = tag.getCompound(FIREWORKS.NBT); NBTTagCompound fireworks = tag.getCompound(FIREWORKS.NBT);
power = 0xff & fireworks.getByte(FLIGHT.NBT); power = (int) fireworks.getByte(FLIGHT.NBT);
if (!fireworks.contains(EXPLOSIONS.NBT)) { if (!fireworks.contains(EXPLOSIONS.NBT)) {
return; return;
@ -181,7 +181,7 @@ class CraftMetaFirework extends CraftMetaItem implements FireworkMeta {
Integer power = SerializableMeta.getObject(Integer.class, map, FLIGHT.BUKKIT, true); Integer power = SerializableMeta.getObject(Integer.class, map, FLIGHT.BUKKIT, true);
if (power != null) { if (power != null) {
setPower(power); this.power = power;
} }
Iterable<?> effects = SerializableMeta.getObject(Iterable.class, map, EXPLOSIONS.BUKKIT, true); Iterable<?> effects = SerializableMeta.getObject(Iterable.class, map, EXPLOSIONS.BUKKIT, true);
@ -234,7 +234,7 @@ class CraftMetaFirework extends CraftMetaItem implements FireworkMeta {
} }
if (hasPower()) { if (hasPower()) {
fireworks.putByte(FLIGHT.NBT, (byte) power); fireworks.putByte(FLIGHT.NBT, power.byteValue());
} }
} }
@ -267,7 +267,7 @@ class CraftMetaFirework extends CraftMetaItem implements FireworkMeta {
} }
boolean hasPower() { boolean hasPower() {
return power != 0; return power != null && power != 0;
} }
@Override @Override