twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-17 21:33:49 -07:00
Code Issues Packages Projects Releases 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
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

Submodule work/Bukkit updated: 14527e6623...e07c383258

2
work/CraftBukkit

Submodule work/CraftBukkit updated: 69970127c1...ec2095d9c6