e4d10a6d67
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 Bukkit Changes: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes: bbe3d58e SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException 3075579f Add FaceAttachable interface to handle Grindstone facing in common with Switches 95bd4238 SPIGOT-5647: ZombieVillager entity should have getVillagerType() 4d975ac3 SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
47 lines
1.9 KiB
Diff
47 lines
1.9 KiB
Diff
From f5469866079fc18d5344de56358dcb363ba3d1c0 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 60716c627..747677511 100644
|
|
--- a/src/main/java/org/bukkit/potion/PotionEffect.java
|
|
+++ b/src/main/java/org/bukkit/potion/PotionEffect.java
|
|
@@ -101,6 +101,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.25.1
|
|
|