mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 08:57:44 +01:00
a2db5eebbe
Upstream has released updates that appears to apply and compile correctly Paper Changes: 8ce3dd5f [CI-SKIP] Fix Mojang API Brigadier dep - THIS IS NOT A NEW BUILD 00d760a5 Fix build due to spigot changing the build timestamp process 842e040c Updated Upstream (Bukkit/CraftBukkit/Spigot) c03260a2 Add getter and setter for villager's numberOfRestocksToday (#3231) fe366fbe null check tracker for entity metadata update - Fixes #3070 fdf41b74 Implement Brigadier Mojang API e0ea2e0e Entity Activation Range 2.0! Major improvements to restoring behavior 10396d28 Fix Tracking Range mismatch on Vehicle/Passenger checks
72 lines
4.2 KiB
Diff
72 lines
4.2 KiB
Diff
From 52c4f9df3b07759bf0646e895f9955d822707ae0 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Sat, 19 Oct 2019 00:52:12 -0500
|
|
Subject: [PATCH] Logger settings (suppressing pointless logs)
|
|
|
|
---
|
|
.../java/net/minecraft/server/GenericAttributes.java | 1 +
|
|
.../net/minecraft/server/WorldGenFeatureConfigured.java | 1 +
|
|
src/main/java/net/pl3x/purpur/PurpurConfig.java | 9 +++++++++
|
|
.../java/org/bukkit/craftbukkit/legacy/CraftLegacy.java | 1 +
|
|
4 files changed, 12 insertions(+)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/GenericAttributes.java b/src/main/java/net/minecraft/server/GenericAttributes.java
|
|
index 469e293c2..ca58302cf 100644
|
|
--- a/src/main/java/net/minecraft/server/GenericAttributes.java
|
|
+++ b/src/main/java/net/minecraft/server/GenericAttributes.java
|
|
@@ -79,6 +79,7 @@ public class GenericAttributes {
|
|
AttributeInstance attributeinstance = attributemapbase.a(nbttagcompound.getString("Name"));
|
|
|
|
if (attributeinstance == null) {
|
|
+ if (!net.pl3x.purpur.PurpurConfig.loggerSuppressUnknownAttributeWarnings) // Purpur
|
|
GenericAttributes.LOGGER.warn("Ignoring unknown attribute '{}'", nbttagcompound.getString("Name"));
|
|
} else {
|
|
a(attributeinstance, nbttagcompound);
|
|
diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java b/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
|
|
index 73402f2b5..1c2320cc5 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
|
|
@@ -47,6 +47,7 @@ public class WorldGenFeatureConfigured<FC extends WorldGenFeatureConfiguration,
|
|
try {
|
|
return new WorldGenFeatureConfigured<>(worldgenerator, dynamic.get("config").orElseEmptyMap());
|
|
} catch (RuntimeException runtimeexception) {
|
|
+ if (!net.pl3x.purpur.PurpurConfig.loggerSuppressWorldGenFeatureDeserializationError) // Purpur
|
|
WorldGenFeatureConfigured.LOGGER.warn("Error while deserializing {}", s);
|
|
return new WorldGenFeatureConfigured<>(WorldGenerator.NO_OP, WorldGenFeatureEmptyConfiguration.e);
|
|
}
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
index 2673de821..852bbf8b8 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
@@ -128,6 +128,15 @@ public class PurpurConfig {
|
|
return config.getString(path, config.getString(path));
|
|
}
|
|
|
|
+ public static boolean loggerSuppressUnknownAttributeWarnings = false;
|
|
+ public static boolean loggerSuppressInitLegacyMaterialError = false;
|
|
+ public static boolean loggerSuppressWorldGenFeatureDeserializationError = false;
|
|
+ private static void loggerSettings() {
|
|
+ loggerSuppressUnknownAttributeWarnings = getBoolean("settings.logger.suppress-unknown-attribute-warnings", loggerSuppressUnknownAttributeWarnings);
|
|
+ loggerSuppressInitLegacyMaterialError = getBoolean("settings.logger.suppress-init-legacy-material-errors", loggerSuppressInitLegacyMaterialError);
|
|
+ loggerSuppressWorldGenFeatureDeserializationError = getBoolean("settings.logger.suppress-world-gen-feature-deserialization-errors", loggerSuppressWorldGenFeatureDeserializationError);
|
|
+ }
|
|
+
|
|
private static void timingsSettings() {
|
|
getString("settings.timings.url", "https://timings.pl3x.net");
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
|
|
index 049e9f98d..1d179cd5b 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
|
|
@@ -254,6 +254,7 @@ public final class CraftLegacy {
|
|
}
|
|
|
|
static {
|
|
+ if (!net.pl3x.purpur.PurpurConfig.loggerSuppressInitLegacyMaterialError) // Purpur
|
|
System.err.println("Initializing Legacy Material Support. Unless you have legacy plugins and/or data this is a bug!");
|
|
if (MinecraftServer.getServer() != null && MinecraftServer.getServer().isDebugging()) {
|
|
new Exception().printStackTrace();
|
|
--
|
|
2.24.0
|
|
|