Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move existing decompile fixes into decompile fixes patch

Browse Source
This commit is contained in:
William Blake Galbreath
2020-02-27 18:19:35 -06:00
parent 5efca4d817
commit 44f63ad4fd
3 changed files with 194 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
patches/server/0006-Logger-settings-suppressing-pointless-logs.patch
View File

@@ -1,14 +1,14 @@
From 5eb128f8c8253f499824ed0788de2d6c6277909b Mon Sep 17 00:00:00 2001
From 66c0fc05bde3188495b1ace6d9a2199a0e826a78 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 | 3 ++-
.../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, 13 insertions(+), 1 deletion(-)
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 469e293c25..ca58302cf7 100644
@@ -23,18 +23,9 @@ index 469e293c25..ca58302cf7 100644
} 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 de8f1874af..1c2320cc54 100644
index 73402f2b5a..1c2320cc54 100644
--- a/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
+++ b/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
@@ -25,7 +25,7 @@ public class WorldGenFeatureConfigured<FC extends WorldGenFeatureConfiguration,
public WorldGenFeatureConfigured<?, ?> a(WorldGenDecoratorConfigured<?> worldgendecoratorconfigured) {
WorldGenerator<WorldGenFeatureCompositeConfiguration> worldgenerator = this.b instanceof WorldGenFlowers ? WorldGenerator.DECORATED_FLOWER : WorldGenerator.DECORATED;
- return worldgenerator.b((WorldGenFeatureConfiguration) (new WorldGenFeatureCompositeConfiguration(this, worldgendecoratorconfigured)));
+ return worldgenerator.b(new WorldGenFeatureCompositeConfiguration(this, worldgendecoratorconfigured)); // Purpur - decompile error
}
public WorldGenFeatureRandomChoiceConfigurationWeight<FC> a(float f) {
@@ -47,6 +47,7 @@ public class WorldGenFeatureConfigured<FC extends WorldGenFeatureConfiguration,
try {
return new WorldGenFeatureConfigured<>(worldgenerator, dynamic.get("config").orElseEmptyMap());