Upstream/EpicHoppers
1
0
Fork 0
mirror of https://github.com/songoda/EpicHoppers.git synced 2025-02-16 20:01:42 +01:00
Code Issues Projects Releases Wiki Activity

Adds support for empty particles (-> no particles)

Browse Source 
Having the particle name set to an empty string (`''`) now tells EpicHoppers that you don't want any particles
This commit is contained in:
Christian Koop 2021-11-19 22:45:34 +01:00
parent 4e2213a6dc
commit e6518ae91a
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/songoda/epichoppers/hopper/Hopper.java
View File

@ -125,8 +125,11 @@ public class Hopper {
}
Location loc = location.clone().add(.5, .5, .5);
CompatibleParticleHandler.spawnParticles(CompatibleParticleHandler.ParticleType.getParticle(Settings.UPGRADE_PARTICLE_TYPE.getString()),
loc, 100, .5, .5, .5);
if (!Settings.UPGRADE_PARTICLE_TYPE.getString().trim().isEmpty()) {
CompatibleParticleHandler.spawnParticles(
CompatibleParticleHandler.ParticleType.getParticle(Settings.UPGRADE_PARTICLE_TYPE.getString()),
loc, 100, .5, .5, .5);
}
if (plugin.getLevelManager().getHighestLevel() != level) {
player.playSound(player.getLocation(), CompatibleSound.ENTITY_PLAYER_LEVELUP.getSound(), 0.6F, 15.0F);

16
src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java
View File

@ -92,14 +92,18 @@ public class ModuleBlockBreak extends Module {
float yy = (float) (0 + (Math.random() * .5));
float zz = (float) (0 + (Math.random() * .5));
Particle particle;
try {
particle = Particle.valueOf(Settings.BLOCKBREAK_PARTICLE.getString());
} catch (Exception e) {
particle = Particle.LAVA;
Particle particle = null;
if (!Settings.BLOCKBREAK_PARTICLE.getString().trim().isEmpty()) {
try {
particle = Particle.valueOf(Settings.BLOCKBREAK_PARTICLE.getString());
} catch (Exception ignore) {
particle = Particle.LAVA;
}
}
above.getWorld().spawnParticle(particle, locationAbove, 15, xx, yy, zz);
if (particle != null) {
above.getWorld().spawnParticle(particle, locationAbove, 15, xx, yy, zz);
}
}
boolean waterlogged = false;