mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 18:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Good enough

Browse Source
This commit is contained in:
CocoTheOwner 2021-09-21 20:27:08 +02:00
parent 0a85521028
commit 54eff0e27f
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/volmit/iris/engine/object/IrisEffect.java
View File

@ -21,12 +21,8 @@ package com.volmit.iris.engine.object;
import com.volmit.iris.Iris; import com.volmit.iris.Iris;
import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.data.cache.AtomicCache;
import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.object.annotations.DependsOn; import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.util.collection.KList;
import com.volmit.iris.engine.object.annotations.MaxNumber;
import com.volmit.iris.engine.object.annotations.MinNumber;
import com.volmit.iris.engine.object.annotations.Required;
import com.volmit.iris.engine.object.annotations.Snippet;
import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.math.RNG;
import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.ChronoLatch;
import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.J;
@ -151,6 +147,9 @@ public class IrisEffect {
@MinNumber(1) @MinNumber(1)
@Desc("The chance is 1 in CHANCE per interval") @Desc("The chance is 1 in CHANCE per interval")
private int chance = 50; private int chance = 50;
@ArrayType(min = 1, type = IrisCommand.class)
@Desc("Run commands, at the exact location of the player")
private KList<IrisCommand> rawCommands = new KList<>();
public boolean canTick() { public boolean canTick() {
return latch.aquire(() -> new ChronoLatch(interval)).flip(); return latch.aquire(() -> new ChronoLatch(interval)).flip();
@ -221,6 +220,14 @@ public class IrisEffect {
} }
} }
if (rawCommands.isNotEmpty()) {
Location part = p.getLocation().clone();
for (IrisCommand rawCommand : rawCommands) {
rawCommand.run(part);
}
}
if (potionStrength > -1) { if (potionStrength > -1) {
if (p.hasPotionEffect(getRealType())) { if (p.hasPotionEffect(getRealType())) {
PotionEffect e = p.getPotionEffect(getRealType()); PotionEffect e = p.getPotionEffect(getRealType());