From 63564ff3e99218e9cbab60cea8ae13eaf09e56e3 Mon Sep 17 00:00:00 2001 From: Yive Date: Sat, 16 Jan 2016 23:04:16 -0800 Subject: [PATCH] Configuration Optimisations --- src/main/java/kcauldron/KCauldronConfig.java | 2 +- .../java/org/spigotmc/SpigotWorldConfig.java | 38 +++++++++---------- src/main/resources/configurations/bukkit.yml | 20 +++++----- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/main/java/kcauldron/KCauldronConfig.java b/src/main/java/kcauldron/KCauldronConfig.java index 1416047..6654028 100644 --- a/src/main/java/kcauldron/KCauldronConfig.java +++ b/src/main/java/kcauldron/KCauldronConfig.java @@ -12,7 +12,7 @@ public class KCauldronConfig extends ConfigBase { public BoolSetting commandEnable = new BoolSetting(this, "command.enable", true, "Enable KCauldron command"); public BoolSetting updatecheckerEnable = new BoolSetting(this, - "updatechecker.enable", true, "Enable KCauldron update checker"); + "updatechecker.enable", false, "Enable KCauldron update checker"); public StringSetting updatecheckerSymlinks = new StringSetting(this, "updatechecker.symlinks", "KCauldron.jar", "(Re)create symlinks after update"); public BoolSetting updatecheckerAutoinstall = new BoolSetting(this, diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java index 86f60df..df0b36f 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -115,14 +115,14 @@ public class SpigotWorldConfig public double itemMerge; private void itemMerge() { - itemMerge = getDouble("merge-radius.item", 2.5 ); + itemMerge = getDouble("merge-radius.item", 4 ); log( "Item Merge Radius: " + itemMerge ); } public double expMerge; private void expMerge() { - expMerge = getDouble("merge-radius.exp", 3.0 ); + expMerge = getDouble("merge-radius.exp", 6 ); log( "Experience Merge Radius: " + expMerge ); } @@ -140,9 +140,9 @@ public class SpigotWorldConfig log( "Mob Spawn Range: " + mobSpawnRange ); } - public int animalActivationRange = 32; - public int monsterActivationRange = 32; - public int miscActivationRange = 16; + public int animalActivationRange = 8; + public int monsterActivationRange = 10; + public int miscActivationRange = 2; private void activationRange() { animalActivationRange = getInt( "entity-activation-range.animals", animalActivationRange ); @@ -151,11 +151,11 @@ public class SpigotWorldConfig log( "Entity Activation Range: An " + animalActivationRange + " / Mo " + monsterActivationRange + " / Mi " + miscActivationRange ); } - public int playerTrackingRange = 48; - public int animalTrackingRange = 48; - public int monsterTrackingRange = 48; - public int miscTrackingRange = 32; - public int maxTrackingRange = 64; + public int playerTrackingRange = 32; + public int animalTrackingRange = 32; + public int monsterTrackingRange = 32; + public int miscTrackingRange = 24; + public int maxTrackingRange = 24; private void trackingRange() { playerTrackingRange = getInt( "entity-tracking-range.players", playerTrackingRange ); @@ -166,8 +166,8 @@ public class SpigotWorldConfig log( "Entity Tracking Range: Pl " + playerTrackingRange + " / An " + animalTrackingRange + " / Mo " + monsterTrackingRange + " / Mi " + miscTrackingRange + " / Other " + maxTrackingRange ); } - public int hopperTransfer = 8; - public int hopperCheck = 8; + public int hopperTransfer = 24; + public int hopperCheck = 24; private void hoppers() { // Set the tick delay between hopper item movements @@ -182,7 +182,7 @@ public class SpigotWorldConfig public boolean randomLightUpdates; private void lightUpdates() { - randomLightUpdates = getBoolean( "random-light-updates", false ); + randomLightUpdates = getBoolean( "random-light-updates", true ); log( "Random Lighting Updates: " + randomLightUpdates ); } @@ -201,14 +201,14 @@ public class SpigotWorldConfig public int itemDespawnRate; private void itemDespawnRate() { - itemDespawnRate = getInt( "item-despawn-rate", 6000 ); + itemDespawnRate = getInt( "item-despawn-rate", 3000 ); log( "Item Despawn Rate: " + itemDespawnRate ); } public int arrowDespawnRate; private void arrowDespawnRate() { - arrowDespawnRate = getInt( "arrow-despawn-rate", 1200 ); + arrowDespawnRate = getInt( "arrow-despawn-rate", 120 ); log( "Arrow Despawn Rate: " + arrowDespawnRate ); } @@ -219,7 +219,7 @@ public class SpigotWorldConfig public AntiXray antiXrayInstance; private void antiXray() { - antiXray = getBoolean( "anti-xray.enabled", true ); + antiXray = getBoolean( "anti-xray.enabled", false ); log( "Anti X-Ray: " + antiXray ); engineMode = getInt( "anti-xray.engine-mode", 1 ); @@ -275,7 +275,7 @@ public class SpigotWorldConfig public int maxCollisionsPerEntity; private void maxEntityCollision() { - maxCollisionsPerEntity = getInt( "max-entity-collisions", 8 ); + maxCollisionsPerEntity = getInt( "max-entity-collisions", 2 ); log( "Max Entity Collisions: " + maxCollisionsPerEntity ); } @@ -283,8 +283,8 @@ public class SpigotWorldConfig public int entityMaxTickTime; private void maxTickTimes() { - tileMaxTickTime = getInt("max-tick-time.tile", 50); - entityMaxTickTime = getInt("max-tick-time.entity", 50); + tileMaxTickTime = getInt("max-tick-time.tile", 1000); + entityMaxTickTime = getInt("max-tick-time.entity", 1000); log("Tile Max Tick Time: " + tileMaxTickTime + "ms Entity max Tick Time: " + entityMaxTickTime + "ms"); } diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml index b2a7bea..febb9fe 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml @@ -15,28 +15,28 @@ settings: allow-end: true - warn-on-overload: true + warn-on-overload: false permissions-file: permissions.yml update-folder: update ping-packet-limit: 100 use-exact-login-location: false plugin-profiling: false connection-throttle: 4000 - query-plugins: true + query-plugins: false deprecated-verbose: default shutdown-message: Server closed spawn-limits: - monsters: 70 - animals: 15 - water-animals: 5 - ambient: 15 + monsters: 50 + animals: 10 + water-animals: 3 + ambient: 4 chunk-gc: - enabled: false - period-in-ticks: 600 - load-threshold: 0 + enabled: true + period-in-ticks: 300 + load-threshold: 300 ticks-per: animal-spawns: 400 - monster-spawns: 1 + monster-spawns: 3 autosave: 6000 auto-updater: enabled: false