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

Update to 1.14.1

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-13 21:34:51 -05:00
parent 8340c3972c
commit 6da8a9ec7f
10 changed files with 55 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,13 +1,13 @@
From b7792aa787f7a551ea71db7ea3f9e6b147c50b7d Mon Sep 17 00:00:00 2001
From a75c3aea676e3f4d63a74ebd6f17b443165f7cb3 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 | 7 ++-----
src/main/java/net/minecraft/server/WorldServer.java | 3 ++-
src/main/java/net/pl3x/purpur/PurpurConfig.java | 7 +++++++
3 files changed, 10 insertions(+), 5 deletions(-)
3 files changed, 10 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,7 +22,7 @@ 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 03da9b3f2..f51d8389b 100644
index 101f4ee5d..6c41c65fc 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1,7 +1,6 @@
@@ -33,23 +33,7 @@ index 03da9b3f2..f51d8389b 100644
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Queues;
@@ -34,15 +33,11 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
// CraftBukkit start
-import java.util.logging.Level;
import org.bukkit.Bukkit;
import org.bukkit.WeatherType;
-import org.bukkit.block.BlockState;
import org.bukkit.craftbukkit.event.CraftEventFactory;
-import org.bukkit.craftbukkit.util.HashTreeSet;
-import org.bukkit.event.block.BlockFormEvent;
import org.bukkit.event.entity.CreatureSpawnEvent;
import org.bukkit.event.server.MapInitializeEvent;
import org.bukkit.event.weather.LightningStrikeEvent;
@@ -984,8 +979,10 @@ public class WorldServer extends World {
@@ -977,8 +976,10 @@ public class WorldServer extends World {
if (entity1 == null) {
return false;
} else {