diff --git a/Spigot-API-Patches/PotionEffect-clone-methods.patch b/Spigot-API-Patches/PotionEffect-clone-methods.patch
new file mode 100644
index 0000000000..0dee522fe9
--- /dev/null
+++ b/Spigot-API-Patches/PotionEffect-clone-methods.patch
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 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 e7b86f85..53fb428f 100644
+--- a/src/main/java/org/bukkit/potion/PotionEffect.java
++++ b/src/main/java/org/bukkit/potion/PotionEffect.java
+@@ -0,0 +0,0 @@ public class PotionEffect implements ConfigurationSerializable {
+         this(getEffectType(map), getInt(map, DURATION), getInt(map, AMPLIFIER), getBool(map, AMBIENT, false), getBool(map, PARTICLES, true));
+     }
+ 
++    // Paper start
++    public PotionEffect withType(PotionEffectType type) {
++        return new PotionEffect(type, duration, amplifier, ambient, particles, color);
++    }
++    public PotionEffect withDuration(int duration) {
++        return new PotionEffect(this.type, duration, amplifier, ambient, particles, color);
++    }
++    public PotionEffect withAmplifier(int amplifier) {
++        return new PotionEffect(this.type, duration, amplifier, ambient, particles, color);
++    }
++    public PotionEffect withAmbient(boolean ambient) {
++        return new PotionEffect(this.type, duration, amplifier, ambient, particles, color);
++    }
++    public PotionEffect withParticles(boolean particles) {
++        return new PotionEffect(this.type, duration, amplifier, ambient, particles, color);
++    }
++    public PotionEffect withParticles(boolean particles, Color color) {
++        return new PotionEffect(this.type, duration, amplifier, ambient, particles, color);
++    }
++    public PotionEffect withColor(Color color) {
++        return new PotionEffect(this.type, duration, amplifier, ambient, particles, color);
++    }
++    // Paper end
++
+     private static PotionEffectType getEffectType(Map<?, ?> map) {
+         int type = getInt(map, TYPE);
+         PotionEffectType effect = PotionEffectType.getById(type);
+--
\ No newline at end of file