From 913a75a4127f1b45e03519f537ab2366b5e0701f Mon Sep 17 00:00:00 2001 From: Aikar <aikar@aikar.co> Date: Fri, 3 Aug 2018 21:23:57 -0400 Subject: [PATCH] remove PotionEffect color API as it was removed upstream appears that value was never even used anyways --- .../PotionEffect-clone-methods.patch | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/Spigot-API-Patches/PotionEffect-clone-methods.patch b/Spigot-API-Patches/PotionEffect-clone-methods.patch index 29f3d327a0..f78b8cf274 100644 --- a/Spigot-API-Patches/PotionEffect-clone-methods.patch +++ b/Spigot-API-Patches/PotionEffect-clone-methods.patch @@ -5,7 +5,7 @@ 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 86616f1b8..35984ef6c 100644 +index 86616f1b8..efb55d29c 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 { @@ -14,25 +14,22 @@ index 86616f1b8..35984ef6c 100644 + // Paper start + public PotionEffect withType(PotionEffectType type) { -+ return new PotionEffect(type, duration, amplifier, ambient, particles, color); ++ return new PotionEffect(type, duration, amplifier, ambient, particles, icon); + } + public PotionEffect withDuration(int duration) { -+ return new PotionEffect(this.type, duration, amplifier, ambient, particles, color); ++ return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon); + } + public PotionEffect withAmplifier(int amplifier) { -+ return new PotionEffect(this.type, duration, amplifier, ambient, particles, color); ++ return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon); + } + public PotionEffect withAmbient(boolean ambient) { -+ return new PotionEffect(this.type, duration, amplifier, ambient, particles, color); ++ return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon); + } + public PotionEffect withParticles(boolean particles) { -+ return new PotionEffect(this.type, duration, amplifier, ambient, particles, color); ++ return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon); + } -+ 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); ++ public PotionEffect withIcon(boolean icon) { ++ return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon); + } + // Paper end +