mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-20 09:35:39 +01:00
0976d52bbd
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Please note that this build includes changes to meet upstreams requirements for nullability annotations. While we aim for a level of accuracy, these might not be 100% correct, if there are any issues, please speak to us on discord, or open an issue on the tracker to discuss. Bukkit Changes: 9a6a1de3 Remove nullability annotations from enum constructors 3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API CraftBukkit Changes:8d8475fcSPIGOT-4666: Force parameter in HumanEntity#sleep8b1588e2Fix ExplosionPrimeEvent#setFire not working with EnderCrystals39a287b7Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
48 lines
1.9 KiB
Diff
48 lines
1.9 KiB
Diff
From 8d34f2367c37cd9a2f1e78b4698332157ae7b670 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sun, 3 Jun 2018 04:10:13 -0400
|
|
Subject: [PATCH] PotionEffect clone methods
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/potion/PotionEffect.java b/src/main/java/org/bukkit/potion/PotionEffect.java
|
|
index d57450c95..4125a024e 100644
|
|
--- a/src/main/java/org/bukkit/potion/PotionEffect.java
|
|
+++ b/src/main/java/org/bukkit/potion/PotionEffect.java
|
|
@@ -103,6 +103,33 @@ public class PotionEffect implements ConfigurationSerializable {
|
|
this(getEffectType(map), getInt(map, DURATION), getInt(map, AMPLIFIER), getBool(map, AMBIENT, false), getBool(map, PARTICLES, true), getBool(map, ICON, getBool(map, PARTICLES, true)));
|
|
}
|
|
|
|
+ // Paper start
|
|
+ @NotNull
|
|
+ public PotionEffect withType(@NotNull PotionEffectType type) {
|
|
+ return new PotionEffect(type, duration, amplifier, ambient, particles, icon);
|
|
+ }
|
|
+ @NotNull
|
|
+ public PotionEffect withDuration(int duration) {
|
|
+ return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon);
|
|
+ }
|
|
+ @NotNull
|
|
+ public PotionEffect withAmplifier(int amplifier) {
|
|
+ return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon);
|
|
+ }
|
|
+ @NotNull
|
|
+ public PotionEffect withAmbient(boolean ambient) {
|
|
+ return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon);
|
|
+ }
|
|
+ @NotNull
|
|
+ public PotionEffect withParticles(boolean particles) {
|
|
+ return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon);
|
|
+ }
|
|
+ @NotNull
|
|
+ public PotionEffect withIcon(boolean icon) {
|
|
+ return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@NotNull
|
|
private static PotionEffectType getEffectType(@NotNull Map<?, ?> map) {
|
|
int type = getInt(map, TYPE);
|
|
--
|
|
2.21.0
|
|
|