From 6c2ca2a4689738e7a7fb686cce4d9be5014627e1 Mon Sep 17 00:00:00 2001 From: Naman Date: Fri, 13 Apr 2018 22:23:04 -0500 Subject: [PATCH] 1.1-RELEASECANDIDATE-2 Scoreboard bug fixed inspect message disable fixed /f seechunk particle options disabled, because they were breaking if invalid. --- .../com/massivecraft/factions/cmd/CmdSeeChunk.java | 4 +++- src/main/resources/config.yml | 10 +--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdSeeChunk.java b/src/main/java/com/massivecraft/factions/cmd/CmdSeeChunk.java index 326423c6..53bd3e36 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdSeeChunk.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdSeeChunk.java @@ -48,7 +48,9 @@ public class CmdSeeChunk extends FCommand { this.useParticles = p.getConfig().getBoolean("see-chunk.particles", true); interval = P.p.getConfig().getLong("see-chunk.interval", 10L); - effect = ParticleEffect.fromName(P.p.getConfig().getString("see-chunk.particle", "REDSTONE")); + if (effect == null){ + effect = ParticleEffect.REDSTONE; + } } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 171eb2a7..f5359bd0 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -849,17 +849,9 @@ Title: # /f seechunk options -# Get a list of particle effects here: -# https://github.com/DarkBlade12/ParticleEffect/blob/master/src/main/java/com/darkblade12/particleeffect/ParticleEffect.java see-chunk: - # If disabled, it will use fake blocks like before (can cause client side lag) particles: true - particle: "BARRIER" - # For Particle types like barrier, the interval can be much higher. but for redstone etc it has to be low, like 10 - # Interval between when particles are sent - # setting to 10 makes it a constant heartbeat effect - # setting to 5, makes it almost solid ( looks better imo but is more intensive) - interval: 20 + interval: 5 ############################################################