Support infinite potion effect durations

EngineHub · Jul 31, 2023 · d9e80c1 · d9e80c1
1 parent dd33d40
commit d9e80c1
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 13 deletions.
diff --git a/src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCPotionMeta.java b/src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCPotionMeta.java
@@ -5,7 +5,9 @@
 import com.laytonsmith.abstraction.MCPotionData;
 import com.laytonsmith.abstraction.MCPotionMeta;
 import com.laytonsmith.abstraction.enums.MCPotionEffectType;
+import com.laytonsmith.abstraction.enums.MCVersion;
 import com.laytonsmith.abstraction.enums.bukkit.BukkitMCPotionEffectType;
+import com.laytonsmith.core.Static;
 import com.laytonsmith.core.constructs.Target;
 import org.bukkit.inventory.meta.PotionMeta;
 import org.bukkit.potion.PotionData;
@@ -36,6 +38,13 @@ public void setBasePotionData(MCPotionData bpd) {
 
 	@Override
 	public boolean addCustomEffect(MCPotionEffectType type, int strength, int ticks, boolean ambient, boolean particles, boolean icon, boolean force, Target t) {
+		if(ticks < 0) {
+			if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_19_X)) {
+				ticks = -1;
+			} else {
+				ticks = Integer.MAX_VALUE;
+			}
+		}
 		PotionEffect pe = new PotionEffect((PotionEffectType) type.getConcrete(), ticks, strength, ambient, particles, icon);
 		return pm.addCustomEffect(pe, force);
 	}

diff --git a/src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCSuspiciousStewMeta.java b/src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCSuspiciousStewMeta.java
@@ -3,7 +3,9 @@
 import com.laytonsmith.abstraction.MCLivingEntity.MCEffect;
 import com.laytonsmith.abstraction.MCSuspiciousStewMeta;
 import com.laytonsmith.abstraction.enums.MCPotionEffectType;
+import com.laytonsmith.abstraction.enums.MCVersion;
 import com.laytonsmith.abstraction.enums.bukkit.BukkitMCPotionEffectType;
+import com.laytonsmith.core.Static;
 import com.laytonsmith.core.constructs.Target;
 import org.bukkit.inventory.meta.SuspiciousStewMeta;
 import org.bukkit.potion.PotionEffect;
@@ -23,6 +25,13 @@ public BukkitMCSuspiciousStewMeta(SuspiciousStewMeta ssm) {
 
 	@Override
 	public boolean addCustomEffect(MCPotionEffectType type, int strength, int ticks, boolean ambient, boolean particles, boolean icon, boolean force, Target t) {
+		if(ticks < 0) {
+			if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_19_X)) {
+				ticks = -1;
+			} else {
+				ticks = Integer.MAX_VALUE;
+			}
+		}
 		PotionEffect pe = new PotionEffect((PotionEffectType) type.getConcrete(), ticks, strength, ambient, particles, icon);
 		return this.ssm.addCustomEffect(pe, force);
 	}

diff --git a/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCAreaEffectCloud.java b/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCAreaEffectCloud.java
@@ -13,8 +13,10 @@
 import com.laytonsmith.abstraction.bukkit.blocks.BukkitMCBlockProjectileSource;
 import com.laytonsmith.abstraction.entities.MCAreaEffectCloud;
 import com.laytonsmith.abstraction.enums.MCParticle;
+import com.laytonsmith.abstraction.enums.MCVersion;
 import com.laytonsmith.abstraction.enums.bukkit.BukkitMCParticle;
 import com.laytonsmith.abstraction.enums.bukkit.BukkitMCPotionEffectType;
+import com.laytonsmith.core.Static;
 import org.bukkit.Color;
 import org.bukkit.Material;
 import org.bukkit.Particle;
@@ -110,8 +112,16 @@ public int getWaitTime() {
 
 	@Override
 	public void addCustomEffect(MCLivingEntity.MCEffect effect) {
+		int ticks = effect.getTicksRemaining();
+		if(ticks < 0) {
+			if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_19_X)) {
+				ticks = -1;
+			} else {
+				ticks = Integer.MAX_VALUE;
+			}
+		}
 		PotionEffectType type = (PotionEffectType) effect.getPotionEffectType().getConcrete();
-		PotionEffect pe = new PotionEffect(type, effect.getTicksRemaining(), effect.getStrength(), effect.isAmbient(),
+		PotionEffect pe = new PotionEffect(type, ticks, effect.getStrength(), effect.isAmbient(),
 				effect.hasParticles(), effect.showIcon());
 		aec.addCustomEffect(pe, true);
 	}

diff --git a/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCArrow.java b/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCArrow.java
@@ -4,7 +4,9 @@
 import com.laytonsmith.abstraction.MCPotionData;
 import com.laytonsmith.abstraction.bukkit.BukkitMCPotionData;
 import com.laytonsmith.abstraction.entities.MCArrow;
+import com.laytonsmith.abstraction.enums.MCVersion;
 import com.laytonsmith.abstraction.enums.bukkit.BukkitMCPotionEffectType;
+import com.laytonsmith.core.Static;
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Entity;
 import org.bukkit.potion.PotionData;
@@ -70,8 +72,16 @@ public List<MCLivingEntity.MCEffect> getCustomEffects() {
 
 	@Override
 	public void addCustomEffect(MCLivingEntity.MCEffect effect) {
+		int ticks = effect.getTicksRemaining();
+		if(ticks < 0) {
+			if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_19_X)) {
+				ticks = -1;
+			} else {
+				ticks = Integer.MAX_VALUE;
+			}
+		}
 		PotionEffect pe = new PotionEffect((PotionEffectType) effect.getPotionEffectType().getConcrete(),
-				effect.getTicksRemaining(), effect.getStrength(), effect.isAmbient(), effect.hasParticles(),
+				ticks, effect.getStrength(), effect.isAmbient(), effect.hasParticles(),
 				effect.showIcon());
 		arrow.addCustomEffect(pe, true);
 	}

diff --git a/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCLivingEntity.java b/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCLivingEntity.java
@@ -15,8 +15,10 @@
 import com.laytonsmith.abstraction.bukkit.blocks.BukkitMCBlock;
 import com.laytonsmith.abstraction.enums.MCAttribute;
 import com.laytonsmith.abstraction.enums.MCPotionEffectType;
+import com.laytonsmith.abstraction.enums.MCVersion;
 import com.laytonsmith.abstraction.enums.bukkit.BukkitMCAttribute;
 import com.laytonsmith.abstraction.enums.bukkit.BukkitMCPotionEffectType;
+import com.laytonsmith.core.Static;
 import com.laytonsmith.core.constructs.Target;
 import com.laytonsmith.core.exceptions.CRE.CREBadEntityException;
 import org.bukkit.Material;
@@ -222,6 +224,13 @@ public boolean hasAI() {
 
 	@Override
 	public boolean addEffect(MCPotionEffectType type, int strength, int ticks, boolean ambient, boolean particles, boolean icon) {
+		if(ticks < 0) {
+			if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_19_X)) {
+				ticks = -1;
+			} else {
+				ticks = Integer.MAX_VALUE;
+			}
+		}
 		PotionEffect pe = new PotionEffect((PotionEffectType) type.getConcrete(), ticks, strength, ambient, particles, icon);
 		return le.addPotionEffect(pe);
 	}

diff --git a/src/main/java/com/laytonsmith/core/ObjectGenerator.java b/src/main/java/com/laytonsmith/core/ObjectGenerator.java
@@ -1763,9 +1763,7 @@ public List<MCLivingEntity.MCEffect> potions(CArray ea, Target t) {
 				}
 				if(effect.containsKey("seconds")) {
 					seconds = ArgumentValidation.getDouble(effect.get("seconds", t), t);
-					if(seconds < 0.0) {
-						throw new CRERangeException("Seconds cannot be less than 0", t);
-					} else if(seconds * 20 > Integer.MAX_VALUE) {
+					if(seconds * 20 > Integer.MAX_VALUE) {
 						throw new CRERangeException("Seconds cannot be greater than 107374182", t);
 					}
 				}

diff --git a/src/main/java/com/laytonsmith/core/functions/MobManagement.java b/src/main/java/com/laytonsmith/core/functions/MobManagement.java
@@ -552,7 +552,8 @@ public String docs() {
 					+ ". It also accepts an integer corresponding to the effect id listed on the Minecraft wiki."
 					+ " Strength is an integer representing the power level of the effect, starting at 0."
 					+ " Seconds defaults to 30.0. To remove an effect, set the seconds to 0."
-					+ " If seconds is less than 0 or greater than 107374182 a RangeException is thrown."
+					+ " If seconds is greater than 107374182 a RangeException is thrown."
+					+ " Negative seconds makes the effect infinite. (or max in versions prior to 1.19.4)"
 					+ " Ambient takes a boolean of whether the particles should be more transparent."
 					+ " Particles takes a boolean of whether the particles should be visible at all."
 					+ " The function returns whether or not the effect was modified.";
@@ -594,9 +595,7 @@ public Mixed exec(Target t, Environment env, Mixed... args) throws ConfigRuntime
 
 				if(args.length >= 4) {
 					seconds = ArgumentValidation.getDouble(args[3], t);
-					if(seconds < 0.0) {
-						throw new CRERangeException("Seconds cannot be less than 0.0", t);
-					} else if(seconds * 20 > Integer.MAX_VALUE) {
+					if(seconds * 20 > Integer.MAX_VALUE) {
 						throw new CRERangeException("Seconds cannot be greater than 107374182.0", t);
 					}
 

diff --git a/src/main/java/com/laytonsmith/core/functions/PlayerManagement.java b/src/main/java/com/laytonsmith/core/functions/PlayerManagement.java
@@ -2237,7 +2237,8 @@ public String docs() {
 					+ ". It also accepts an integer corresponding to the effect id listed on the Minecraft wiki."
 					+ " Strength is an integer representing the power level of the effect, starting at 0."
 					+ " Seconds defaults to 30.0. To remove an effect, set the seconds to 0."
-					+ " If seconds is less than 0 or greater than 107374182 a RangeException is thrown."
+					+ " If seconds is greater than 107374182 a RangeException is thrown."
+					+ " Negative seconds makes the effect infinite. (or max in versions prior to 1.19.4)"
 					+ " Ambient takes a boolean of whether the particles should be more transparent."
 					+ " Particles takes a boolean of whether the particles should be visible at all."
 					+ " The function returns whether or not the effect was modified.";
@@ -2294,9 +2295,7 @@ public Mixed exec(Target t, Environment env, Mixed... args) throws ConfigRuntime
 
 				if(args.length >= 4) {
 					seconds = ArgumentValidation.getDouble(args[3], t);
-					if(seconds < 0.0) {
-						throw new CRERangeException("Seconds cannot be less than 0.0", t);
-					} else if(seconds * 20 > Integer.MAX_VALUE) {
+					if(seconds * 20 > Integer.MAX_VALUE) {
 						throw new CRERangeException("Seconds cannot be greater than 107374182.0", t);
 					}