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

Update upstream

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-19 01:55:18 -05:00
parent b247fbd4eb
commit 0554ce8234
4 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
patches/server/0013-Add-config-to-suppress-specific-log-outputs.patch
View File

@@ -1,13 +1,13 @@
From a75c3aea676e3f4d63a74ebd6f17b443165f7cb3 Mon Sep 17 00:00:00 2001
From 015122f2521686cbc28dbfb986d376b666402cf6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 10 May 2019 19:17:36 -0500
Subject: [PATCH] Add config to suppress specific log outputs
---
src/main/java/net/minecraft/server/GenericAttributes.java | 1 +
src/main/java/net/minecraft/server/WorldServer.java | 3 ++-
src/main/java/net/minecraft/server/WorldServer.java | 2 +-
src/main/java/net/pl3x/purpur/PurpurConfig.java | 7 +++++++
3 files changed, 10 insertions(+), 1 deletion(-)
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/GenericAttributes.java b/src/main/java/net/minecraft/server/GenericAttributes.java
index 908f11f98..20c3b37d3 100644
@@ -22,28 +22,18 @@ index 908f11f98..20c3b37d3 100644
} else {
a(attributeinstance, nbttagcompound);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 101f4ee5d..6c41c65fc 100644
index 3ed12672e..d82102bd8 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1,7 +1,6 @@
package net.minecraft.server;
@@ -985,7 +985,7 @@ public class WorldServer extends World {
return false;
}
- if (DEBUG_ENTITIES && entity.world.paperConfig.duplicateUUIDMode != PaperWorldConfig.DuplicateUUIDMode.NOTHING) {
+ if (net.pl3x.purpur.PurpurConfig.showDuplicateEntityUUIDErrors && DEBUG_ENTITIES && entity.world.paperConfig.duplicateUUIDMode != PaperWorldConfig.DuplicateUUIDMode.NOTHING) { // Purpur
WorldServer.LOGGER.error("Keeping entity {} that already exists with UUID {}", EntityTypes.getName(entity1.getEntityType()), entity.getUniqueID().toString()); // CraftBukkit // paper
WorldServer.LOGGER.error("Deleting duplicate entity {}", entity); // CraftBukkit // paper
import co.aikar.timings.TimingHistory;
-import co.aikar.timings.Timings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Queues;
@@ -977,8 +976,10 @@ public class WorldServer extends World {
if (entity1 == null) {
return false;
} else {
+ if (net.pl3x.purpur.PurpurConfig.showDuplicateEntityUUIDErrors) { // Purpur
WorldServer.LOGGER.error("Keeping entity {} that already exists with UUID {}", EntityTypes.getName(entity1.getEntityType()), entity.getUniqueID().toString()); // CraftBukkit // paper
WorldServer.LOGGER.error("Deleting duplicate entity {}", entity); // CraftBukkit // paper
+ } // Purpur
return true;
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 28f80e1a5..d75580ce6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java