mirror of
https://github.com/BX-Team/DivineMC.git
synced 2025-12-19 14:59:25 +00:00
Optimize default config values
This commit is contained in:
@@ -0,0 +1,19 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
|
||||
Date: Sat, 11 Jan 2025 23:20:56 +0300
|
||||
Subject: [PATCH] Proxy offline warning
|
||||
|
||||
|
||||
diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
|
||||
index 88c699c16718e27b1c44db8f4460f2efcf04e492..d24e988a87d6defe5ac3d5483b54704225ebb7f0 100644
|
||||
--- a/net/minecraft/server/dedicated/DedicatedServer.java
|
||||
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
|
||||
@@ -312,7 +312,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
||||
String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord";
|
||||
String proxyLink = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "https://docs.papermc.io/velocity/security" : "http://www.spigotmc.org/wiki/firewall-guide/";
|
||||
// Paper end - Add Velocity IP Forwarding Support
|
||||
- if (!this.usesAuthentication()) {
|
||||
+ if (!io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()) { // DivineMC - if server uses proxy (velocity or bungee), disable offline warning
|
||||
LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
|
||||
LOGGER.warn("The server will make no attempt to authenticate usernames. Beware.");
|
||||
// Spigot start
|
||||
@@ -1,11 +1,11 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
|
||||
Date: Mon, 27 Mar 2023 13:16:41 +0300
|
||||
Date: Sat, 11 Jan 2025 23:18:11 +0300
|
||||
Subject: [PATCH] Optimize default values for configs
|
||||
|
||||
|
||||
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
||||
index 088b8fe5d144807f4da1e85b2fa34dfd21286f8c..0e35a057eb408942f49f472bb36f8c77af8aa364 100644
|
||||
index 088b8fe5d144807f4da1e85b2fa34dfd21286f8c..c10aa23e8f742bef703247b76109778ec5c2ecd8 100644
|
||||
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
||||
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
||||
@@ -336,9 +336,9 @@ public class GlobalConfiguration extends ConfigurationPart {
|
||||
@@ -13,15 +13,15 @@ index 088b8fe5d144807f4da1e85b2fa34dfd21286f8c..0e35a057eb408942f49f472bb36f8c77
|
||||
public boolean loadPermissionsYmlBeforePlugins = true;
|
||||
@Constraints.Min(4)
|
||||
- public int regionFileCacheSize = 256;
|
||||
+ public int regionFileCacheSize = 512; // DivineMC - optimize default values for configs
|
||||
+ public int regionFileCacheSize = 512; // DivineMC - Optimize default values for configs
|
||||
@Comment("See https://luckformula.emc.gs")
|
||||
- public boolean useAlternativeLuckFormula = false;
|
||||
+ public boolean useAlternativeLuckFormula = true; // DivineMC - optimize default values for configs
|
||||
+ public boolean useAlternativeLuckFormula = true; // DivineMC - Optimize default values for configs
|
||||
public boolean useDimensionTypeForCustomSpawners = false;
|
||||
public boolean strictAdvancementDimensionCheck = false;
|
||||
public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT;
|
||||
diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
|
||||
index 82210667376fd466d5d4cdcb56b62f6165bd5cde..0fef474e1bd0298c212b98369042917ebd6f475e 100644
|
||||
index 229404b8583adc9723e3186775f38fdb97daacbc..a308eb1e2d43627c5f92e5b625024fecf9a4c63c 100644
|
||||
--- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
|
||||
+++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
|
||||
@@ -156,9 +156,9 @@ public class WorldConfiguration extends ConfigurationPart {
|
||||
@@ -43,8 +43,8 @@ index 82210667376fd466d5d4cdcb56b62f6165bd5cde..0fef474e1bd0298c212b98369042917e
|
||||
public class Behavior extends ConfigurationPart {
|
||||
- public boolean disableChestCatDetection = false;
|
||||
- public boolean spawnerNerfedMobsShouldJump = false;
|
||||
+ public boolean disableChestCatDetection = true; // DivineMC - optimize default values for configs
|
||||
+ public boolean spawnerNerfedMobsShouldJump = true; // DivineMC - optimize default values for configs
|
||||
+ public boolean disableChestCatDetection = true; // DivineMC - Optimize default values for configs
|
||||
+ public boolean spawnerNerfedMobsShouldJump = true; // DivineMC - Optimize default values for configs
|
||||
public int experienceMergeMaxValue = -1;
|
||||
public boolean shouldRemoveDragon = false;
|
||||
public boolean zombiesTargetTurtleEggs = true;
|
||||
@@ -53,7 +53,7 @@ index 82210667376fd466d5d4cdcb56b62f6165bd5cde..0fef474e1bd0298c212b98369042917e
|
||||
public int phantomsSpawnAttemptMinSeconds = 60;
|
||||
public int phantomsSpawnAttemptMaxSeconds = 119;
|
||||
- public boolean parrotsAreUnaffectedByPlayerMovement = false;
|
||||
+ public boolean parrotsAreUnaffectedByPlayerMovement = true; // DivineMC - optimize default values for configs
|
||||
+ public boolean parrotsAreUnaffectedByPlayerMovement = true; // DivineMC - Optimize default values for configs
|
||||
@BelowZeroToEmpty
|
||||
public DoubleOr.Default zombieVillagerInfectionChance = DoubleOr.Default.USE_DEFAULT;
|
||||
public MobsCanAlwaysPickUpLoot mobsCanAlwaysPickUpLoot;
|
||||
@@ -62,7 +62,7 @@ index 82210667376fd466d5d4cdcb56b62f6165bd5cde..0fef474e1bd0298c212b98369042917e
|
||||
|
||||
public boolean disablePlayerCrits = false;
|
||||
- public boolean nerfPigmenFromNetherPortals = false;
|
||||
+ public boolean nerfPigmenFromNetherPortals = true; // DivineMC - optimize default values for configs
|
||||
+ public boolean nerfPigmenFromNetherPortals = true; // DivineMC - Optimize default values for configs
|
||||
@Comment("Prevents merging items that are not on the same y level, preventing potential visual artifacts.")
|
||||
public boolean onlyMergeItemsHorizontally = false;
|
||||
public PillagerPatrols pillagerPatrols;
|
||||
@@ -71,7 +71,7 @@ index 82210667376fd466d5d4cdcb56b62f6165bd5cde..0fef474e1bd0298c212b98369042917e
|
||||
public boolean disableThunder = false;
|
||||
public boolean disableIceAndSnow = false;
|
||||
- public boolean optimizeExplosions = false;
|
||||
+ public boolean optimizeExplosions = true; // DivineMC - optimize default values for configs
|
||||
+ public boolean optimizeExplosions = true; // DivineMC - Optimize default values for configs
|
||||
public boolean disableExplosionKnockback = false;
|
||||
public boolean generateFlatBedrock = false;
|
||||
public FrostedIce frostedIce;
|
||||
@@ -80,7 +80,7 @@ index 82210667376fd466d5d4cdcb56b62f6165bd5cde..0fef474e1bd0298c212b98369042917e
|
||||
public class Maps extends ConfigurationPart {
|
||||
public int itemFrameCursorLimit = 128;
|
||||
- public int itemFrameCursorUpdateInterval = 10;
|
||||
+ public int itemFrameCursorUpdateInterval = 20; // DivineMC - optimize default values for configs
|
||||
+ public int itemFrameCursorUpdateInterval = 20; // DivineMC - Optimize default values for configs
|
||||
}
|
||||
|
||||
public Fixes fixes;
|
||||
@@ -89,7 +89,7 @@ index 82210667376fd466d5d4cdcb56b62f6165bd5cde..0fef474e1bd0298c212b98369042917e
|
||||
public boolean cooldownWhenFull = true;
|
||||
public boolean disableMoveEvent = false;
|
||||
- public boolean ignoreOccludingBlocks = false;
|
||||
+ public boolean ignoreOccludingBlocks = true; // DivineMC - optimize default values for configs
|
||||
+ public boolean ignoreOccludingBlocks = true; // DivineMC - Optimize default values for configs
|
||||
}
|
||||
|
||||
public Collisions collisions;
|
||||
@@ -98,10 +98,10 @@ index 82210667376fd466d5d4cdcb56b62f6165bd5cde..0fef474e1bd0298c212b98369042917e
|
||||
public boolean onlyPlayersCollide = false;
|
||||
public boolean allowVehicleCollisions = true;
|
||||
- public boolean fixClimbingBypassingCrammingRule = false;
|
||||
+ public boolean fixClimbingBypassingCrammingRule = true; // DivineMC - optimize default values for configs
|
||||
+ public boolean fixClimbingBypassingCrammingRule = true; // DivineMC - Optimize default values for configs
|
||||
@RequiresSpigotInitialization(MaxEntityCollisionsInitializer.class)
|
||||
- public int maxEntityCollisions = 8;
|
||||
+ public int maxEntityCollisions = 2; // DivineMC - optimize default values for configs
|
||||
+ public int maxEntityCollisions = 2; // DivineMC - Optimize default values for configs
|
||||
public boolean allowPlayerCrammingDamage = false;
|
||||
}
|
||||
|
||||
@@ -110,12 +110,12 @@ index 82210667376fd466d5d4cdcb56b62f6165bd5cde..0fef474e1bd0298c212b98369042917e
|
||||
public class Chunks extends ConfigurationPart {
|
||||
public AutosavePeriod autoSaveInterval = AutosavePeriod.def();
|
||||
- public int maxAutoSaveChunksPerTick = 24;
|
||||
+ public int maxAutoSaveChunksPerTick = 12;
|
||||
+ public int maxAutoSaveChunksPerTick = 12; // DivineMC - Optimize default values for configs
|
||||
public int fixedChunkInhabitedTime = -1;
|
||||
- public boolean preventMovingIntoUnloadedChunks = false;
|
||||
- public Duration delayChunkUnloadsBy = Duration.of("10s");
|
||||
+ public boolean preventMovingIntoUnloadedChunks = true; // DivineMC - optimize default values for configs
|
||||
+ public Duration delayChunkUnloadsBy = Duration.of("5s"); // DivineMC - optimize default values for configs
|
||||
+ public boolean preventMovingIntoUnloadedChunks = true;
|
||||
+ public Duration delayChunkUnloadsBy = Duration.of("5s");
|
||||
public Reference2IntMap<EntityType<?>> entityPerChunkSaveLimit = Util.make(new Reference2IntOpenHashMap<>(BuiltInRegistries.ENTITY_TYPE.size()), map -> {
|
||||
- map.defaultReturnValue(-1);
|
||||
- map.put(EntityType.EXPERIENCE_ORB, -1);
|
||||
@@ -124,7 +124,7 @@ index 82210667376fd466d5d4cdcb56b62f6165bd5cde..0fef474e1bd0298c212b98369042917e
|
||||
- map.put(EntityType.ARROW, -1);
|
||||
- map.put(EntityType.FIREBALL, -1);
|
||||
- map.put(EntityType.SMALL_FIREBALL, -1);
|
||||
+ // DivineMC start - optimize default values for configs
|
||||
+ // DivineMC start - Optimize default values for configs
|
||||
+ map.put(EntityType.EXPERIENCE_ORB, 16);
|
||||
+ map.put(EntityType.SNOWBALL, 8);
|
||||
+ map.put(EntityType.ENDER_PEARL, 8);
|
||||
@@ -147,203 +147,173 @@ index 82210667376fd466d5d4cdcb56b62f6165bd5cde..0fef474e1bd0298c212b98369042917e
|
||||
});
|
||||
public boolean flushRegionsOnSave = false;
|
||||
}
|
||||
@@ -535,13 +548,15 @@ public class WorldConfiguration extends ConfigurationPart {
|
||||
@@ -535,13 +548,13 @@ public class WorldConfiguration extends ConfigurationPart {
|
||||
public TickRates tickRates;
|
||||
|
||||
public class TickRates extends ConfigurationPart {
|
||||
- public int grassSpread = 1;
|
||||
- public int containerUpdate = 1;
|
||||
- public int mobSpawner = 1;
|
||||
+ // DivineMC start - optimize default values for configs
|
||||
+ public int grassSpread = 4;
|
||||
+ public int containerUpdate = 3;
|
||||
+ public int mobSpawner = 2;
|
||||
+ public int grassSpread = 4; // DivineMC - Optimize default values for configs
|
||||
+ public int containerUpdate = 3; // DivineMC - Optimize default values for configs
|
||||
+ public int mobSpawner = 2; // DivineMC - Optimize default values for configs
|
||||
public int wetFarmland = 1;
|
||||
public int dryFarmland = 1;
|
||||
- public Table<EntityType<?>, String, Integer> sensor = Util.make(HashBasedTable.create(), table -> table.put(EntityType.VILLAGER, "secondarypoisensor", 40));
|
||||
- public Table<EntityType<?>, String, Integer> behavior = Util.make(HashBasedTable.create(), table -> table.put(EntityType.VILLAGER, "validatenearbypoi", -1));
|
||||
+ public Table<EntityType<?>, String, Integer> sensor = Util.make(HashBasedTable.create(), table -> table.put(EntityType.VILLAGER, "secondarypoisensor", 80));
|
||||
+ public Table<EntityType<?>, String, Integer> behavior = Util.make(HashBasedTable.create(), table -> table.put(EntityType.VILLAGER, "validatenearbypoi", 60));
|
||||
+ // DivineMC end
|
||||
+ public Table<EntityType<?>, String, Integer> sensor = Util.make(HashBasedTable.create(), table -> table.put(EntityType.VILLAGER, "secondarypoisensor", 80)); // DivineMC - Optimize default values for configs
|
||||
+ public Table<EntityType<?>, String, Integer> behavior = Util.make(HashBasedTable.create(), table -> table.put(EntityType.VILLAGER, "validatenearbypoi", 60)); // DivineMC - Optimize default values for configs
|
||||
}
|
||||
|
||||
@Setting(FeatureSeedsGeneration.FEATURE_SEEDS_KEY)
|
||||
@@ -550,7 +565,7 @@ public class WorldConfiguration extends ConfigurationPart {
|
||||
@@ -550,7 +563,7 @@ public class WorldConfiguration extends ConfigurationPart {
|
||||
public class FeatureSeeds extends ConfigurationPart {
|
||||
@SuppressWarnings("unused") // Is used in FeatureSeedsGeneration
|
||||
@Setting(FeatureSeedsGeneration.GENERATE_KEY)
|
||||
- public boolean generateRandomSeedsForAll = false;
|
||||
+ public boolean generateRandomSeedsForAll = true; // DivineMC - optimize default values for configs
|
||||
+ public boolean generateRandomSeedsForAll = true; // DivineMC - Optimize default values for configs
|
||||
@Setting(FeatureSeedsGeneration.FEATURES_KEY)
|
||||
public Reference2LongMap<Holder<ConfiguredFeature<?, ?>>> features = new Reference2LongOpenHashMap<>();
|
||||
|
||||
@@ -571,9 +586,9 @@ public class WorldConfiguration extends ConfigurationPart {
|
||||
@@ -571,9 +584,9 @@ public class WorldConfiguration extends ConfigurationPart {
|
||||
|
||||
public class Misc extends ConfigurationPart {
|
||||
public int lightQueueSize = 20;
|
||||
- public boolean updatePathfindingOnBlockUpdate = true;
|
||||
+ public boolean updatePathfindingOnBlockUpdate = false; // DivineMC - optimize default values for configs
|
||||
+ public boolean updatePathfindingOnBlockUpdate = false; // DivineMC - Optimize default values for configs
|
||||
public boolean showSignClickCommandFailureMsgsToPlayer = false;
|
||||
- public RedstoneImplementation redstoneImplementation = RedstoneImplementation.VANILLA;
|
||||
+ public RedstoneImplementation redstoneImplementation = RedstoneImplementation.ALTERNATE_CURRENT; // DivineMC - optimize default values for configs
|
||||
+ public RedstoneImplementation redstoneImplementation = RedstoneImplementation.ALTERNATE_CURRENT; // DivineMC - Optimize default values for configs
|
||||
public AlternateCurrentUpdateOrder alternateCurrentUpdateOrder = AlternateCurrentUpdateOrder.HORIZONTAL_FIRST_OUTWARD;
|
||||
public boolean disableEndCredits = false;
|
||||
public DoubleOr.Default maxLeashDistance = DoubleOr.Default.USE_DEFAULT;
|
||||
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||
index c9fc57d6b00bf5ca57805c9ad2829646de347475..75919064593167b51c4325ba6d500366ba8408f1 100644
|
||||
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||
@@ -352,7 +352,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
||||
String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord";
|
||||
String proxyLink = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "https://docs.papermc.io/velocity/security" : "http://www.spigotmc.org/wiki/firewall-guide/";
|
||||
// Paper end - Add Velocity IP Forwarding Support
|
||||
- if (!this.usesAuthentication()) {
|
||||
+ if (!io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()) { // DivineMC - if server uses proxy (velocity or bungee), disable offline warning
|
||||
DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
|
||||
DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware.");
|
||||
// Spigot start
|
||||
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||
index 7690441b5059ae6c7ca8519875ea8a515c5c5e93..6a161bb00b4665cf0b148bc7eabd8b07c6b07e99 100644
|
||||
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||
@@ -244,7 +244,7 @@ public class PurpurConfig {
|
||||
laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
|
||||
}
|
||||
|
||||
- public static boolean useAlternateKeepAlive = false;
|
||||
+ public static boolean useAlternateKeepAlive = true;
|
||||
private static void useAlternateKeepAlive() {
|
||||
useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
|
||||
}
|
||||
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
||||
index 4dbb109d0526afee99b9190fc256585121aac9b5..85a5d8e26832c88afc212c3f600e686076596fbb 100644
|
||||
index e0d4222a99f22d7130d95cf29b034a98f2f3b76e..ecedb1ba79fa40180ff7eb16d12a4602ab357de3 100644
|
||||
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
||||
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
||||
@@ -331,7 +331,7 @@ public class SpigotConfig
|
||||
@@ -269,7 +269,7 @@ public class SpigotConfig {
|
||||
|
||||
public static boolean saveUserCacheOnStopOnly;
|
||||
private static void saveUserCacheOnStopOnly()
|
||||
{
|
||||
- SpigotConfig.saveUserCacheOnStopOnly = SpigotConfig.getBoolean( "settings.save-user-cache-on-stop-only", false );
|
||||
+ SpigotConfig.saveUserCacheOnStopOnly = SpigotConfig.getBoolean( "settings.save-user-cache-on-stop-only", true ); // DivineMC - optimize default values for configs
|
||||
private static void saveUserCacheOnStopOnly() {
|
||||
- SpigotConfig.saveUserCacheOnStopOnly = SpigotConfig.getBoolean("settings.save-user-cache-on-stop-only", false);
|
||||
+ SpigotConfig.saveUserCacheOnStopOnly = SpigotConfig.getBoolean("settings.save-user-cache-on-stop-only", true); // DivineMC - Optimize default values for configs
|
||||
}
|
||||
|
||||
public static double movedWronglyThreshold;
|
||||
@@ -395,8 +395,10 @@ public class SpigotConfig
|
||||
@@ -323,9 +323,9 @@ public class SpigotConfig {
|
||||
|
||||
public static boolean logVillagerDeaths;
|
||||
public static boolean logNamedDeaths;
|
||||
private static void logDeaths() {
|
||||
- private static void logDeaths() {
|
||||
- SpigotConfig.logVillagerDeaths = SpigotConfig.getBoolean("settings.log-villager-deaths", true);
|
||||
- SpigotConfig.logNamedDeaths = SpigotConfig.getBoolean("settings.log-named-deaths", true);
|
||||
+ // DivineMC start - optimize default values for configs
|
||||
+ private static void logDeaths() { // DivineMC - Optimize default values for configs
|
||||
+ SpigotConfig.logVillagerDeaths = SpigotConfig.getBoolean("settings.log-villager-deaths", false);
|
||||
+ SpigotConfig.logNamedDeaths = SpigotConfig.getBoolean("settings.log-named-deaths", false);
|
||||
+ // DivineMC end
|
||||
}
|
||||
|
||||
public static boolean disablePlayerDataSaving;
|
||||
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
||||
index 2c408fa4abcbe1171c58aee8799c8cf7867d0f0a..0e6b697c6e8503beeed9412abddad2b512246b37 100644
|
||||
index 89e2adbc1e1a0709d03e151e3ffcdbff10a44098..5b305092a808c2b9b339b9072bf7f7bfc00f0b8a 100644
|
||||
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
||||
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
||||
@@ -150,14 +150,14 @@ public class SpigotWorldConfig
|
||||
@@ -135,13 +135,13 @@ public class SpigotWorldConfig {
|
||||
|
||||
public double itemMerge;
|
||||
private void itemMerge()
|
||||
{
|
||||
- this.itemMerge = this.getDouble("merge-radius.item", 0.5 );
|
||||
+ this.itemMerge = this.getDouble("merge-radius.item", 3.5 ); // DivineMC - optimize default values for configs
|
||||
this.log( "Item Merge Radius: " + this.itemMerge );
|
||||
private void itemMerge() {
|
||||
- this.itemMerge = this.getDouble("merge-radius.item", 0.5);
|
||||
+ this.itemMerge = this.getDouble("merge-radius.item", 3.5); // DivineMC - Optimize default values for configs
|
||||
this.log("Item Merge Radius: " + this.itemMerge);
|
||||
}
|
||||
|
||||
public double expMerge;
|
||||
private void expMerge()
|
||||
{
|
||||
- this.expMerge = this.getDouble("merge-radius.exp", -1 );
|
||||
+ this.expMerge = this.getDouble("merge-radius.exp", 4.0 ); // DivineMC - optimize default values for configs
|
||||
this.log( "Experience Merge Radius: " + this.expMerge );
|
||||
private void expMerge() {
|
||||
- this.expMerge = this.getDouble("merge-radius.exp", -1);
|
||||
+ this.expMerge = this.getDouble("merge-radius.exp", 4.0); // DivineMC - Optimize default values for configs
|
||||
this.log("Experience Merge Radius: " + this.expMerge);
|
||||
}
|
||||
|
||||
@@ -196,7 +196,7 @@ public class SpigotWorldConfig
|
||||
@@ -174,7 +174,7 @@ public class SpigotWorldConfig {
|
||||
|
||||
public byte mobSpawnRange;
|
||||
private void mobSpawnRange()
|
||||
{
|
||||
- this.mobSpawnRange = (byte) getInt( "mob-spawn-range", 8 ); // Paper - Vanilla
|
||||
+ this.mobSpawnRange = (byte) getInt( "mob-spawn-range", 2 ); // Paper - Vanilla // DivineMC - optimize default values for configs
|
||||
this.log( "Mob Spawn Range: " + this.mobSpawnRange );
|
||||
private void mobSpawnRange() {
|
||||
- this.mobSpawnRange = (byte) getInt("mob-spawn-range", 8); // Paper - Vanilla
|
||||
+ this.mobSpawnRange = (byte) getInt("mob-spawn-range", 2); // DivineMC - Optimize default values for configs
|
||||
this.log("Mob Spawn Range: " + this.mobSpawnRange);
|
||||
}
|
||||
|
||||
@@ -207,14 +207,16 @@ public class SpigotWorldConfig
|
||||
this.log( "Item Despawn Rate: " + this.itemDespawnRate );
|
||||
@@ -184,14 +184,16 @@ public class SpigotWorldConfig {
|
||||
this.log("Item Despawn Rate: " + this.itemDespawnRate);
|
||||
}
|
||||
|
||||
- public int animalActivationRange = 32;
|
||||
- public int monsterActivationRange = 32;
|
||||
- public int raiderActivationRange = 64;
|
||||
- public int miscActivationRange = 16;
|
||||
+ // DivineMC start - optimize default values for configs
|
||||
+ // DivineMC start - Optimize default values for configs
|
||||
+ public int animalActivationRange = 16;
|
||||
+ public int monsterActivationRange = 24;
|
||||
+ public int raiderActivationRange = 48;
|
||||
+ public int miscActivationRange = 8;
|
||||
+ // DivineMC end
|
||||
+ // DivineMC end - Optimize default values for configs
|
||||
// Paper start
|
||||
public int flyingMonsterActivationRange = 32;
|
||||
- public int waterActivationRange = 16;
|
||||
- public int villagerActivationRange = 32;
|
||||
+ public int waterActivationRange = 8; // DivineMC - optimize default values for configs
|
||||
+ public int villagerActivationRange = 16; // DivineMC - optimize default values for configs
|
||||
+ public int waterActivationRange = 8; // DivineMC - Optimize default values for configs
|
||||
+ public int villagerActivationRange = 16; // DivineMC - Optimize default values for configs
|
||||
public int wakeUpInactiveAnimals = 4;
|
||||
public int wakeUpInactiveAnimalsEvery = 60*20;
|
||||
public int wakeUpInactiveAnimalsFor = 5*20;
|
||||
@@ -231,7 +233,7 @@ public class SpigotWorldConfig
|
||||
public int wakeUpInactiveAnimalsEvery = 60 * 20;
|
||||
public int wakeUpInactiveAnimalsFor = 5 * 20;
|
||||
@@ -208,7 +210,7 @@ public class SpigotWorldConfig {
|
||||
public int villagersWorkImmunityFor = 20;
|
||||
public boolean villagersActiveForPanic = true;
|
||||
// Paper end
|
||||
- public boolean tickInactiveVillagers = true;
|
||||
+ public boolean tickInactiveVillagers = false; // DivineMC - optimize default values for configs
|
||||
+ public boolean tickInactiveVillagers = false; // DivineMC - Optimize default values for configs
|
||||
public boolean ignoreSpectatorActivation = false;
|
||||
private void activationRange()
|
||||
{
|
||||
@@ -299,7 +301,7 @@ public class SpigotWorldConfig
|
||||
{
|
||||
this.set( "ticks-per.hopper-check", 1 );
|
||||
|
||||
private void activationRange() {
|
||||
@@ -273,7 +275,7 @@ public class SpigotWorldConfig {
|
||||
if (SpigotConfig.version < 11) {
|
||||
this.set("ticks-per.hopper-check", 1);
|
||||
}
|
||||
- this.hopperCheck = this.getInt( "ticks-per.hopper-check", 1 );
|
||||
+ this.hopperCheck = this.getInt( "ticks-per.hopper-check", 8 ); // DivineMC - optimize default values for configs
|
||||
this.hopperAmount = this.getInt( "hopper-amount", 1 );
|
||||
this.hopperCanLoadChunks = this.getBoolean( "hopper-can-load-chunks", false );
|
||||
this.log( "Hopper Transfer: " + this.hopperTransfer + " Hopper Check: " + this.hopperCheck + " Hopper Amount: " + this.hopperAmount + " Hopper Can Load Chunks: " + this.hopperCanLoadChunks );
|
||||
@@ -309,7 +311,7 @@ public class SpigotWorldConfig
|
||||
- this.hopperCheck = this.getInt("ticks-per.hopper-check", 1);
|
||||
+ this.hopperCheck = this.getInt("ticks-per.hopper-check", 8); // DivineMC - Optimize default values for configs
|
||||
this.hopperAmount = this.getInt("hopper-amount", 1);
|
||||
this.hopperCanLoadChunks = this.getBoolean("hopper-can-load-chunks", false);
|
||||
this.log("Hopper Transfer: " + this.hopperTransfer + " Hopper Check: " + this.hopperCheck + " Hopper Amount: " + this.hopperAmount + " Hopper Can Load Chunks: " + this.hopperCanLoadChunks);
|
||||
@@ -282,7 +284,7 @@ public class SpigotWorldConfig {
|
||||
public int arrowDespawnRate;
|
||||
public int tridentDespawnRate;
|
||||
private void arrowDespawnRate()
|
||||
{
|
||||
- this.arrowDespawnRate = this.getInt( "arrow-despawn-rate", 1200 );
|
||||
+ this.arrowDespawnRate = this.getInt( "arrow-despawn-rate", 300 ); // DivineMC - optimize default values for configs
|
||||
this.tridentDespawnRate = this.getInt( "trident-despawn-rate", this.arrowDespawnRate );
|
||||
this.log( "Arrow Despawn Rate: " + this.arrowDespawnRate + " Trident Respawn Rate:" + this.tridentDespawnRate );
|
||||
private void arrowDespawnRate() {
|
||||
- this.arrowDespawnRate = this.getInt("arrow-despawn-rate", 1200);
|
||||
+ this.arrowDespawnRate = this.getInt("arrow-despawn-rate", 300); // DivineMC - Optimize default values for configs
|
||||
this.tridentDespawnRate = this.getInt("trident-despawn-rate", this.arrowDespawnRate);
|
||||
this.log("Arrow Despawn Rate: " + this.arrowDespawnRate + " Trident Respawn Rate:" + this.tridentDespawnRate);
|
||||
}
|
||||
@@ -324,14 +326,14 @@ public class SpigotWorldConfig
|
||||
@@ -295,13 +297,13 @@ public class SpigotWorldConfig {
|
||||
|
||||
public boolean nerfSpawnerMobs;
|
||||
private void nerfSpawnerMobs()
|
||||
{
|
||||
- this.nerfSpawnerMobs = this.getBoolean( "nerf-spawner-mobs", false );
|
||||
+ this.nerfSpawnerMobs = this.getBoolean( "nerf-spawner-mobs", true ); // DivineMC - optimize default values for configs
|
||||
this.log( "Nerfing mobs spawned from spawners: " + this.nerfSpawnerMobs );
|
||||
private void nerfSpawnerMobs() {
|
||||
- this.nerfSpawnerMobs = this.getBoolean("nerf-spawner-mobs", false);
|
||||
+ this.nerfSpawnerMobs = this.getBoolean("nerf-spawner-mobs", true); // DivineMC - Optimize default values for configs
|
||||
this.log("Nerfing mobs spawned from spawners: " + this.nerfSpawnerMobs);
|
||||
}
|
||||
|
||||
public boolean enableZombiePigmenPortalSpawns;
|
||||
private void enableZombiePigmenPortalSpawns()
|
||||
{
|
||||
- this.enableZombiePigmenPortalSpawns = this.getBoolean( "enable-zombie-pigmen-portal-spawns", true );
|
||||
+ this.enableZombiePigmenPortalSpawns = this.getBoolean( "enable-zombie-pigmen-portal-spawns", false ); // DivineMC - optimize default values for configs
|
||||
this.log( "Allow Zombie Pigmen to spawn from portal blocks: " + this.enableZombiePigmenPortalSpawns );
|
||||
private void enableZombiePigmenPortalSpawns() {
|
||||
- this.enableZombiePigmenPortalSpawns = this.getBoolean("enable-zombie-pigmen-portal-spawns", true);
|
||||
+ this.enableZombiePigmenPortalSpawns = this.getBoolean("enable-zombie-pigmen-portal-spawns", false); // DivineMC - Optimize default values for configs
|
||||
this.log("Allow Zombie Pigmen to spawn from portal blocks: " + this.enableZombiePigmenPortalSpawns);
|
||||
}
|
||||
|
||||
@@ -449,7 +451,7 @@ public class SpigotWorldConfig
|
||||
@@ -413,7 +415,7 @@ public class SpigotWorldConfig {
|
||||
|
||||
public int hangingTickFrequency;
|
||||
private void hangingTickFrequency()
|
||||
{
|
||||
- this.hangingTickFrequency = this.getInt( "hanging-tick-frequency", 100 );
|
||||
+ this.hangingTickFrequency = this.getInt( "hanging-tick-frequency", 200 ); // DivineMC - optimize default values for configs
|
||||
private void hangingTickFrequency() {
|
||||
- this.hangingTickFrequency = this.getInt("hanging-tick-frequency", 100);
|
||||
+ this.hangingTickFrequency = this.getInt("hanging-tick-frequency", 200); // DivineMC - Optimize default values for configs
|
||||
}
|
||||
|
||||
public int tileMaxTickTime;
|
||||
@@ -0,0 +1,19 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
|
||||
Date: Sat, 11 Jan 2025 23:22:12 +0300
|
||||
Subject: [PATCH] Optimize default values for configs
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||
index 3b0875ed8ef29a5cede89e22e86bf90ab99d7f13..c5f0b3a31dfa851363df5f96d193c313474b192b 100644
|
||||
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||
@@ -201,7 +201,7 @@ public class PurpurConfig {
|
||||
laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
|
||||
}
|
||||
|
||||
- public static boolean useAlternateKeepAlive = false;
|
||||
+ public static boolean useAlternateKeepAlive = true; // DivineMC - Optimize default values for configs
|
||||
private static void useAlternateKeepAlive() {
|
||||
useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
|
||||
}
|
||||
Reference in New Issue
Block a user