diff --git a/Changelog.txt b/Changelog.txt index 70e0d30fb..cb30316f0 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -49,6 +49,7 @@ Version 1.5.01-dev ! Changed behavior of the Blast Mining ability "Demolition Expert"; now only decreases damage for the ability user ! Updated for new getOnlinePlayers() behavior ! Changed McMMOPlayerDeathPenaltyEvent to get fired after hardcore penalty calculations, use McMMOPlayerPreDeathPenaltyEvent for old behavior + ! Moved Refresh_Chunks setting from hidden.yml to config.yml - Removed salvage ability from Repair, salvage has it's own (child) skill now Version 1.5.00 diff --git a/src/main/java/com/gmail/nossr50/config/Config.java b/src/main/java/com/gmail/nossr50/config/Config.java index 0a0d6ac85..ef3213b36 100644 --- a/src/main/java/com/gmail/nossr50/config/Config.java +++ b/src/main/java/com/gmail/nossr50/config/Config.java @@ -252,6 +252,7 @@ public class Config extends AutoUpdateConfigLoader { public long getDatabasePlayerCooldown() { return config.getLong("Commands.Database.Player_Cooldown", 1750); } public boolean getLevelUpSoundsEnabled() { return config.getBoolean("General.LevelUp_Sounds", true); } + public boolean getRefreshChunksEnabled() { return config.getBoolean("General.Refresh_Chunks", false); } /* Mob Healthbar */ public MobHealthbarType getMobHealthbarDefault() { diff --git a/src/main/java/com/gmail/nossr50/config/HiddenConfig.java b/src/main/java/com/gmail/nossr50/config/HiddenConfig.java index bd551e990..76eca334d 100644 --- a/src/main/java/com/gmail/nossr50/config/HiddenConfig.java +++ b/src/main/java/com/gmail/nossr50/config/HiddenConfig.java @@ -11,7 +11,6 @@ public class HiddenConfig { private boolean chunkletsEnabled; private int conversionRate; private boolean useEnchantmentBuffs; - private boolean resendChunksAfterBlockAbility; private int uuidConvertAmount; private int mojangRateLimit; private long mojangLimitPeriod; @@ -35,7 +34,6 @@ public class HiddenConfig { chunkletsEnabled = config.getBoolean("Options.Chunklets", true); conversionRate = config.getInt("Options.ConversionRate", 1); useEnchantmentBuffs = config.getBoolean("Options.EnchantmentBuffs", true); - resendChunksAfterBlockAbility = config.getBoolean("Options.RefreshChunks", false); uuidConvertAmount = config.getInt("Options.UUIDConvertAmount", 5); mojangRateLimit = config.getInt("Options.MojangRateLimit", 50000); mojangLimitPeriod = config.getLong("Options.MojangLimitPeriod", 600000); @@ -54,10 +52,6 @@ public class HiddenConfig { return useEnchantmentBuffs; } - public boolean resendChunksAfterBlockAbility() { - return resendChunksAfterBlockAbility; - } - public int getUUIDConvertAmount() { return uuidConvertAmount; } diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java b/src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java index 2f90895a5..2beac4031 100644 --- a/src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java @@ -6,7 +6,7 @@ import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.config.HiddenConfig; +import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.datatypes.skills.AbilityType; import com.gmail.nossr50.util.EventUtils; @@ -39,7 +39,7 @@ public class AbilityDisableTask extends BukkitRunnable { // Fallthrough case BERSERK: - if (HiddenConfig.getInstance().resendChunksAfterBlockAbility()) { + if (Config.getInstance().getRefreshChunksEnabled()) { resendChunkRadiusAt(player, 1); } // Fallthrough diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index aee39c6f2..3923da078 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -27,6 +27,11 @@ General: # Play level-up sounds LevelUp_Sounds: true + # This should fix blocks being broken client side, but not server-side. + # Enable to refresh the chunks around a player at the end of Super Breaker, + # Giga Drill Breaker, and Berserk. Resource intensive for larger servers. + Refresh_Chunks: false + # # Settings for the mcMMO scoreboards ### diff --git a/src/main/resources/hidden.yml b/src/main/resources/hidden.yml index c158e8122..c30176d6a 100644 --- a/src/main/resources/hidden.yml +++ b/src/main/resources/hidden.yml @@ -9,8 +9,6 @@ Options: ConversionRate: 1 # true to use enchantment buffs for Super Breaker & Giga Drill Breaker, false to use potion buffs EnchantmentBuffs: true - # true to enable refreshing of chunks around a player at the end of Super Breaker, Giga Drill Breaker, and Berserk. This should fix blocks being broken client side, but not server-side - RefreshChunks: false # Amount of users to convert every interval UUIDConvertAmount: 100