mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 04:02:50 +01:00
36f34f01c0
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: da9ef3c5 #496: Add methods to get/set ItemStacks in EquipmentSlots 3abebc9f #492: Let Tameable extend Animals rather than Entity 941111a0 #495: Expose ItemStack and hand used in PlayerShearEntityEvent 4fe19cae #494: InventoryView - Add missing Brewing FUEL_TIME CraftBukkit Changes:933e9094#664: Add methods to get/set ItemStacks in EquipmentSlots18722312#662: Expose ItemStack and hand used in PlayerShearEntityEvent
44 lines
1.9 KiB
Diff
44 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
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 60716c627d315b08c3fe03b1a945af60c350711f..74767751199bce03d63f2a9524712656193f850c 100644
|
|
--- a/src/main/java/org/bukkit/potion/PotionEffect.java
|
|
+++ b/src/main/java/org/bukkit/potion/PotionEffect.java
|
|
@@ -101,6 +101,33 @@ 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
|
|
+ @NotNull
|
|
+ public PotionEffect withType(@NotNull PotionEffectType type) {
|
|
+ return new PotionEffect(type, duration, amplifier, ambient, particles, icon);
|
|
+ }
|
|
+ @NotNull
|
|
+ public PotionEffect withDuration(int duration) {
|
|
+ return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon);
|
|
+ }
|
|
+ @NotNull
|
|
+ public PotionEffect withAmplifier(int amplifier) {
|
|
+ return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon);
|
|
+ }
|
|
+ @NotNull
|
|
+ public PotionEffect withAmbient(boolean ambient) {
|
|
+ return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon);
|
|
+ }
|
|
+ @NotNull
|
|
+ public PotionEffect withParticles(boolean particles) {
|
|
+ return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon);
|
|
+ }
|
|
+ @NotNull
|
|
+ public PotionEffect withIcon(boolean icon) {
|
|
+ return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@NotNull
|
|
private static PotionEffectType getEffectType(@NotNull Map<?, ?> map) {
|
|
int type = getInt(map, TYPE);
|