Upstream
/
Minestom
mirror of https://github.com/Minestom/Minestom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add potion constructor without flags, style

This commit is contained in:
themode 2021-12-20 17:30:01 +01:00 committed by TheMode
parent 064146b4fd
commit 74e00bc70c
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/net/minestom/server/potion/Potion.java
View File

@ -8,8 +8,8 @@ import net.minestom.server.utils.binary.BinaryWriter;
import net.minestom.server.utils.binary.Writeable;
import org.jetbrains.annotations.NotNull;
public record Potion(PotionEffect effect, byte amplifier, int duration, byte flags)
implements Writeable {
public record Potion(@NotNull PotionEffect effect, byte amplifier,
int duration, byte flags) implements Writeable {
/**
* A flag indicating that this Potion is ambient (it came from a beacon).
*
@ -18,7 +18,7 @@ public record Potion(PotionEffect effect, byte amplifier, int duration, byte fla
* @see #flags()
*/
public static final byte AMBIENT_FLAG = 0x01;
/**
* A flag indicating that this Potion has particles.
*
@ -27,7 +27,7 @@ public record Potion(PotionEffect effect, byte amplifier, int duration, byte fla
* @see #flags()
*/
public static final byte PARTICLES_FLAG = 0x02;
/**
* A flag indicating that this Potion has an icon.
*
@ -36,15 +36,19 @@ public record Potion(PotionEffect effect, byte amplifier, int duration, byte fla
* @see #flags()
*/
public static final byte ICON_FLAG = 0x04;
public Potion(@NotNull PotionEffect effect, byte amplifier, int duration) {
this(effect, amplifier, duration, (byte) 0);
}
public Potion(BinaryReader reader) {
this(PotionEffect.fromId(reader.readVarInt()), reader.readByte(),
reader.readVarInt(), reader.readByte());
}
/**
* Returns the flags that this Potion has.
*
*
* @see #AMBIENT_FLAG
* @see #PARTICLES_FLAG
* @see #ICON_FLAG
@ -53,29 +57,32 @@ public record Potion(PotionEffect effect, byte amplifier, int duration, byte fla
public byte flags() {
return flags;
}
/**
* Returns whether this Potion is ambient (it came from a beacon) or not.
*
* @return <code>true</code> if the Potion is ambient
*/
public boolean isAmbient() {
return (flags & AMBIENT_FLAG) == AMBIENT_FLAG;
return (flags & AMBIENT_FLAG) == AMBIENT_FLAG;
}
/**
* Returns whether this Potion has particles or not.
*
* @return <code>true</code> if the Potion has particles
*/
public boolean hasParticles() {
return (flags & PARTICLES_FLAG) == PARTICLES_FLAG;
return (flags & PARTICLES_FLAG) == PARTICLES_FLAG;
}
/**
* Returns whether this Potion has an icon or not.
*
* @return <code>true</code> if the Potion has an icon
*/
public boolean hasIcon() {
return (flags & ICON_FLAG) == ICON_FLAG;
return (flags & ICON_FLAG) == ICON_FLAG;
}
/**