Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add potion effect improvements for modern #1441

Merged
merged 1 commit into from
Nov 25, 2024
Merged

Add potion effect improvements for modern #1441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions core/src/main/java/tc/oc/pgm/kits/PotionKit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,21 @@ public PotionKit(Set<PotionEffect> effects) {

@Override
public void applyPostEvent(MatchPlayer player, boolean force, List<ItemStack> displacedItems) {
var pl = player.getBukkit();
if (force) {
for (PotionEffect effect : this.effects) {
player.getBukkit().addPotionEffect(effect, true);
// Forced potion eff with duration = 0 is used to remove effects, however in modern versions
// due to allowing multiple of the same effect, they aren't removed.
// This makes the behavior explicit that forcing an effect with duration 0 removes it.
if (effect.getDuration() != 0) pl.addPotionEffect(effect, true);
else pl.removePotionEffect(effect.getType());
}
} else {
player.getBukkit().addPotionEffects(this.effects);
pl.addPotionEffects(this.effects);
}

// No swirls by default, KitNode can re-enable them if it so desires
PLAYER_UTILS.setPotionParticles(player.getBukkit(), false);
PLAYER_UTILS.setPotionParticles(pl, false);
}

@Override
Expand Down
8 changes: 8 additions & 0 deletions util/src/main/java/tc/oc/pgm/util/platform/Platform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@ public static void init() throws Throwable {
return (T) Platform.getBestSupported(clazz);
}

public static boolean isLegacy() {
return VARIANT == Variant.SPORTPAPER;
}

public static boolean isModern() {
return VARIANT == Variant.PAPER;
}

private static <T> Iterable<Class<?>> getSupported(Class<T> parent) {
return REFLECTIONS.get(TypesAnnotated.with(Supports.class, Supports.List.class)
.asClass()
Expand Down
4 changes: 1 addition & 3 deletions util/src/main/java/tc/oc/pgm/util/tablist/TablistResizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package tc.oc.pgm.util.tablist;

import static tc.oc.pgm.util.platform.Supports.Variant.SPORTPAPER;

import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.events.ListenerPriority;
Expand All @@ -13,7 +11,7 @@
public class TablistResizer {
private static final int TAB_SIZE = 80;
// In 1.20.6 the field to edit is 1, unsure what version exactly broke it
private static final int FIELD = Platform.VARIANT == SPORTPAPER ? 2 : 1;
private static final int FIELD = Platform.isLegacy() ? 2 : 1;

public static void registerAdapter(Plugin plugin) {
ProtocolLibrary.getProtocolManager().addPacketListener(new TablistResizePacketAdapter(plugin));
Expand Down
7 changes: 6 additions & 1 deletion util/src/main/java/tc/oc/pgm/util/xml/XMLUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import tc.oc.pgm.util.material.matcher.AllMaterialMatcher;
import tc.oc.pgm.util.material.matcher.BlockMaterialMatcher;
import tc.oc.pgm.util.math.OffsetVector;
import tc.oc.pgm.util.platform.Platform;
import tc.oc.pgm.util.range.Ranges;
import tc.oc.pgm.util.skin.Skin;
import tc.oc.pgm.util.text.TextException;
Expand Down Expand Up @@ -833,7 +834,11 @@ public static PotionEffectType parsePotionEffectType(Node node, String text)

private static PotionEffect createPotionEffect(
PotionEffectType type, Duration duration, int amplifier, boolean ambient) {
return new PotionEffect(type, (int) TimeUtils.toTicks(duration), amplifier, ambient);
// Modern supports infinite durations with value -1
int ticks = Platform.isModern() && TimeUtils.isInfinite(duration)
? -1
: (int) TimeUtils.toTicks(duration);
return new PotionEffect(type, ticks, amplifier, ambient);
}

public static PotionEffect parsePotionEffect(Element el) throws InvalidXMLException {
Expand Down