OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 15:49:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

update upstream

Browse source
This commit is contained in:
Aikar 2018-08-03 20:31:44 -04:00
parent 5148f6bae0
commit 4b75d48de3
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Spigot-API-Patches/PotionEffect-clone-methods.patch
View file

@ -5,11 +5,11 @@ 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
@@ -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));
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

2
work/Bukkit

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

2
work/CraftBukkit

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