mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
66e5b110ac
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@4ac995a Update log4j to 2.16.0
42 lines
2.5 KiB
Diff
42 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Wed, 18 Aug 2021 13:53:37 -0500
|
|
Subject: [PATCH] Change Airplane defaults closer to vanilla
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
index 6cda37d340bfc6f76cbb3bdaa3ffb6d3cf90da9f..3ed3f8124ca302b0527788d80fd5a4a87d206534 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
@@ -205,7 +205,7 @@ public class PaperConfig {
|
|
public static String timingsServerName;
|
|
private static void timings() {
|
|
boolean timings = getBoolean("timings.enabled", true);
|
|
- // Airplane start
|
|
+ /* // Airplane start // Purpur start
|
|
boolean reallyEnableTimings = getBoolean("timings.really-enabled", false);
|
|
if (timings && !reallyEnableTimings) {
|
|
Bukkit.getLogger().log(Level.WARNING, "[Airplane] To improve performance, timings have been disabled by default");
|
|
@@ -213,7 +213,7 @@ public class PaperConfig {
|
|
Bukkit.getLogger().log(Level.WARNING, "[Airplane] If you would like to disable this message, either set timings.really-enabled to true or timings.enabled to false.");
|
|
}
|
|
timings = reallyEnableTimings;
|
|
- // Airplane end
|
|
+ // Airplane end */ // Purpur end
|
|
boolean verboseTimings = getBoolean("timings.verbose", true);
|
|
TimingsManager.url = getString("timings.url", "https://timings.aikar.co/");
|
|
if (!TimingsManager.url.endsWith("/")) {
|
|
diff --git a/src/main/java/gg/airplane/AirplaneConfig.java b/src/main/java/gg/airplane/AirplaneConfig.java
|
|
index f34327d578ea8acfd4bb8f6f933af5d4f0f49c90..44f3d6a5e2729507fcc7246149183c304fb3ad97 100644
|
|
--- a/src/main/java/gg/airplane/AirplaneConfig.java
|
|
+++ b/src/main/java/gg/airplane/AirplaneConfig.java
|
|
@@ -193,7 +193,7 @@ public class AirplaneConfig {
|
|
public static int activationDistanceMod;
|
|
|
|
private static void dynamicActivationOfBrains() throws IOException {
|
|
- dearEnabled = getBoolean("dab.enabled", "activation-range.enabled", true);
|
|
+ dearEnabled = getBoolean("dab.enabled", "activation-range.enabled", false); // Purpur
|
|
startDistance = getInt("dab.start-distance", "activation-range.start-distance", 12,
|
|
"This value determines how far away an entity has to be",
|
|
"from the player to start being effected by DEAR.");
|