From eabe735a12c83b9f8a7e1714697661979793cb85 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 3 Aug 2018 20:31:44 -0400 Subject: [PATCH] update upstream --- Spigot-API-Patches/0103-PotionEffect-clone-methods.patch | 8 ++++---- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch b/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch index 85abfd11b..7970d6f6f 100644 --- a/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch +++ b/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch @@ -1,15 +1,15 @@ -From 4855d23362468c0d6936adad449d9b43a4a8c80d Mon Sep 17 00:00:00 2001 +From fa0d7b6333526b569fbbcb238d570f0ae7949651 Mon Sep 17 00:00:00 2001 From: Aikar 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 +index 86616f1b8..35984ef6c 100644 --- a/src/main/java/org/bukkit/potion/PotionEffect.java +++ b/src/main/java/org/bukkit/potion/PotionEffect.java -@@ -99,6 +99,30 @@ public class PotionEffect implements ConfigurationSerializable { - this(getEffectType(map), getInt(map, DURATION), getInt(map, AMPLIFIER), getBool(map, AMBIENT, false), getBool(map, PARTICLES, true)); +@@ -100,6 +100,30 @@ 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 diff --git a/work/Bukkit b/work/Bukkit index 14527e662..e07c38325 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 14527e6623aa40fa6fbb74013cb16e8a6bfff737 +Subproject commit e07c38325891cfaf6915881b4998c39b830ab6ea diff --git a/work/CraftBukkit b/work/CraftBukkit index 69970127c..ec2095d9c 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 69970127c11e52c579cc17d4ce263a344735940a +Subproject commit ec2095d9c6dc466bf9be6b515fc7cc40739f89d8