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

fix effects

Browse Source
This commit is contained in:
Julian Krings 2025-06-18 12:00:55 +02:00
parent 96a384c09c
commit bef99f18c3
No known key found for this signature in database
GPG Key ID: 208C6E08C3B718D2
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,7 +195,7 @@ public class IrisEffect {
if (sound != null) { if (sound != null) {
Location part = p.getLocation().clone().add(RNG.r.i(-soundDistance, soundDistance), RNG.r.i(-soundDistance, soundDistance), RNG.r.i(-soundDistance, soundDistance)); Location part = p.getLocation().clone().add(RNG.r.i(-soundDistance, soundDistance), RNG.r.i(-soundDistance, soundDistance), RNG.r.i(-soundDistance, soundDistance));
J.s(() -> p.playSound(part, getSound(), (float) volume, (float) RNG.r.d(minPitch, maxPitch))); schedule(p, () -> p.playSound(part, getSound(), (float) volume, (float) RNG.r.d(minPitch, maxPitch)));
} }
if (particleEffect != null) { if (particleEffect != null) {
@ -205,7 +205,7 @@ public class IrisEffect {
part.add(RNG.r.d(), 0, RNG.r.d()); part.add(RNG.r.d(), 0, RNG.r.d());
int offset = p.getWorld().getMinHeight(); int offset = p.getWorld().getMinHeight();
if (extra != 0) { if (extra != 0) {
J.s(() -> p.spawnParticle(particleEffect, part.getX(), part.getY() + offset + RNG.r.i(particleOffset), schedule(p, () -> p.spawnParticle(particleEffect, part.getX(), part.getY() + offset + RNG.r.i(particleOffset),
part.getZ(), part.getZ(),
particleCount, particleCount,
randomAltX ? RNG.r.d(-particleAltX, particleAltX) : particleAltX, randomAltX ? RNG.r.d(-particleAltX, particleAltX) : particleAltX,
@ -213,7 +213,7 @@ public class IrisEffect {
randomAltZ ? RNG.r.d(-particleAltZ, particleAltZ) : particleAltZ, randomAltZ ? RNG.r.d(-particleAltZ, particleAltZ) : particleAltZ,
extra)); extra));
} else { } else {
J.s(() -> p.spawnParticle(particleEffect, part.getX(), part.getY() + offset + RNG.r.i(particleOffset), part.getZ(), schedule(p, () -> p.spawnParticle(particleEffect, part.getX(), part.getY() + offset + RNG.r.i(particleOffset), part.getZ(),
particleCount, particleCount,
randomAltX ? RNG.r.d(-particleAltX, particleAltX) : particleAltX, randomAltX ? RNG.r.d(-particleAltX, particleAltX) : particleAltX,
randomAltY ? RNG.r.d(-particleAltY, particleAltY) : particleAltY, randomAltY ? RNG.r.d(-particleAltY, particleAltY) : particleAltY,
@ -232,10 +232,10 @@ public class IrisEffect {
return; return;
} }
J.s(() -> p.removePotionEffect(getRealType())); schedule(p, () -> p.removePotionEffect(getRealType()));
} }
J.s(() -> p.addPotionEffect(new PotionEffect(getRealType(), schedule(p, () -> p.addPotionEffect(new PotionEffect(getRealType(),
RNG.r.i(Math.min(potionTicksMax, potionTicksMin), RNG.r.i(Math.min(potionTicksMax, potionTicksMin),
Math.max(potionTicksMax, potionTicksMin)), Math.max(potionTicksMax, potionTicksMin)),
getPotionStrength(), getPotionStrength(),
@ -255,7 +255,7 @@ public class IrisEffect {
if (sound != null) { if (sound != null) {
Location part = p.getLocation().clone().add(RNG.r.i(-soundDistance, soundDistance), RNG.r.i(-soundDistance, soundDistance), RNG.r.i(-soundDistance, soundDistance)); Location part = p.getLocation().clone().add(RNG.r.i(-soundDistance, soundDistance), RNG.r.i(-soundDistance, soundDistance), RNG.r.i(-soundDistance, soundDistance));
J.s(() -> p.getWorld().playSound(part, getSound(), (float) volume, (float) RNG.r.d(minPitch, maxPitch))); schedule(p, () -> p.getWorld().playSound(part, getSound(), (float) volume, (float) RNG.r.d(minPitch, maxPitch)));
} }
if (particleEffect != null) { if (particleEffect != null) {
@ -263,7 +263,7 @@ public class IrisEffect {
part.add(RNG.r.d(), 0, RNG.r.d()); part.add(RNG.r.d(), 0, RNG.r.d());
int offset = p.getWorld().getMinHeight(); int offset = p.getWorld().getMinHeight();
if (extra != 0) { if (extra != 0) {
J.s(() -> p.getWorld().spawnParticle(particleEffect, part.getX(), part.getY() + offset + RNG.r.i(particleOffset), schedule(p, () -> p.getWorld().spawnParticle(particleEffect, part.getX(), part.getY() + offset + RNG.r.i(particleOffset),
part.getZ(), part.getZ(),
particleCount, particleCount,
randomAltX ? RNG.r.d(-particleAltX, particleAltX) : particleAltX, randomAltX ? RNG.r.d(-particleAltX, particleAltX) : particleAltX,
@ -271,7 +271,7 @@ public class IrisEffect {
randomAltZ ? RNG.r.d(-particleAltZ, particleAltZ) : particleAltZ, randomAltZ ? RNG.r.d(-particleAltZ, particleAltZ) : particleAltZ,
extra)); extra));
} else { } else {
J.s(() -> p.getWorld().spawnParticle(particleEffect, part.getX(), part.getY() + offset + RNG.r.i(particleOffset), part.getZ(), schedule(p, () -> p.getWorld().spawnParticle(particleEffect, part.getX(), part.getY() + offset + RNG.r.i(particleOffset), part.getZ(),
particleCount, particleCount,
randomAltX ? RNG.r.d(-particleAltX, particleAltX) : particleAltX, randomAltX ? RNG.r.d(-particleAltX, particleAltX) : particleAltX,
randomAltY ? RNG.r.d(-particleAltY, particleAltY) : particleAltY, randomAltY ? RNG.r.d(-particleAltY, particleAltY) : particleAltY,
@ -279,4 +279,8 @@ public class IrisEffect {
} }
} }
} }
private void schedule(Entity entity, Runnable task) {
Iris.scheduler.entity(entity).run(task, null);
}
} }