core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update upstream

This commit is contained in:
Aikar 2018-08-03 20:31:44 -04:00
parent dbc4c29d6c
commit eabe735a12
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-API-Patches/0103-PotionEffect-clone-methods.patch
View File

@ -1,15 +1,15 @@
From 4855d23362468c0d6936adad449d9b43a4a8c80d Mon Sep 17 00:00:00 2001 From fa0d7b6333526b569fbbcb238d570f0ae7949651 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 3 Jun 2018 04:10:13 -0400 Date: Sun, 3 Jun 2018 04:10:13 -0400
Subject: [PATCH] PotionEffect clone methods 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 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 --- a/src/main/java/org/bukkit/potion/PotionEffect.java
+++ b/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 { @@ -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)); 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 + // Paper start

2
work/Bukkit

@ -1 +1 @@
Subproject commit 14527e6623aa40fa6fbb74013cb16e8a6bfff737 Subproject commit e07c38325891cfaf6915881b4998c39b830ab6ea

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 69970127c11e52c579cc17d4ce263a344735940a Subproject commit ec2095d9c6dc466bf9be6b515fc7cc40739f89d8