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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
94315dad Fix erroneuous entity count reporting in timings
This commit is contained in:
William Blake Galbreath
2020-07-15 13:15:36 -05:00
parent d636ce7a97
commit d4b37c750c
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0033-Logger-settings-suppressing-pointless-logs.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Logger settings (suppressing pointless logs)
diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
index d3387a4e16..fd22020037 100644
index 1588d101e..fc4c1c1cd 100644
--- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
+++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
@@ -165,6 +165,7 @@ public class AdvancementDataPlayer {
@@ -169,6 +169,7 @@ public class AdvancementDataPlayer {
if (advancement == null) {
// CraftBukkit start
if (entry.getKey().getNamespace().equals("minecraft")) {
@@ -17,7 +17,7 @@ index d3387a4e16..fd22020037 100644
}
// CraftBukkit end
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 04ed0b1dba..83d146a18c 100644
index 04ed0b1db..83d146a18 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -182,4 +182,11 @@ public class PurpurConfig {
@@ -33,7 +33,7 @@ index 04ed0b1dba..83d146a18c 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
index b14333ce9e..d25204f7d4 100644
index b14333ce9..d25204f7d 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 {