mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 17:17:13 +01:00
30 lines
1.7 KiB
Diff
30 lines
1.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Tamion <70228790+notTamion@users.noreply.github.com>
|
||
|
|
Date: Sun, 5 Nov 2023 09:51:28 +0100
|
||
|
|
Subject: [PATCH] Add HiddenPotionEffect API
|
||
|
|
|
||
|
|
== AT ==
|
||
|
|
public net.minecraft.world.effect.MobEffectInstance hiddenEffect
|
||
|
|
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java
|
||
|
|
index 844fb8c662a409670f631228f687d85c5436d3dd..e938255fcc5db0c289d3e132175a541187e4a748 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java
|
||
|
|
@@ -73,6 +73,7 @@ public class CraftPotionUtil {
|
||
|
|
|
||
|
|
public static MobEffectInstance fromBukkit(PotionEffect effect) {
|
||
|
|
MobEffect type = CraftPotionEffectType.bukkitToMinecraft(effect.getType());
|
||
|
|
+ // Paper - Note: do not copy over the hidden effect, as this method is only used for applying to entities which we do not want to convert over.
|
||
|
|
return new MobEffectInstance(type, effect.getDuration(), effect.getAmplifier(), effect.isAmbient(), effect.hasParticles(), effect.hasIcon()); // Paper
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -82,7 +83,7 @@ public class CraftPotionUtil {
|
||
|
|
int duration = effect.getDuration();
|
||
|
|
boolean ambient = effect.isAmbient();
|
||
|
|
boolean particles = effect.isVisible();
|
||
|
|
- return new PotionEffect(type, duration, amp, ambient, particles, effect.showIcon()); // Paper
|
||
|
|
+ return new PotionEffect(type, duration, amp, ambient, particles, effect.showIcon(), effect.hiddenEffect == null ? null : toBukkit(effect.hiddenEffect)); // Paper
|
||
|
|
}
|
||
|
|
|
||
|
|
public static boolean equals(MobEffect mobEffect, PotionEffectType type) {
|