mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 15:08:27 +02:00
improved the water code so that immunity wont trigger if the entity has the water pathfinder system active, so this improves support for all entities that know how to behave in water. Merged 2 EAR patches together, and removed an MCUtil method that doesnt have a purpose anymore
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From 2e7ba223102646f119fdfdbee12670b397a3b8d2 Mon Sep 17 00:00:00 2001
|
|
From: Minecrell <minecrell@minecrell.net>
|
|
Date: Tue, 17 Jul 2018 16:42:17 +0200
|
|
Subject: [PATCH] Use asynchronous Log4j 2 loggers
|
|
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
index b28f8e0929..6d8b27e927 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -73,6 +73,13 @@
|
|
<artifactId>log4j-iostreams</artifactId>
|
|
<version>2.8.1</version>
|
|
</dependency>
|
|
+ <!-- Paper - Async loggers -->
|
|
+ <dependency>
|
|
+ <groupId>com.lmax</groupId>
|
|
+ <artifactId>disruptor</artifactId>
|
|
+ <version>3.4.2</version>
|
|
+ <scope>runtime</scope>
|
|
+ </dependency>
|
|
<dependency>
|
|
<groupId>org.ow2.asm</groupId>
|
|
<artifactId>asm</artifactId>
|
|
diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties
|
|
new file mode 100644
|
|
index 0000000000..ee7c90784c
|
|
--- /dev/null
|
|
+++ b/src/main/resources/log4j2.component.properties
|
|
@@ -0,0 +1 @@
|
|
+Log4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector
|
|
--
|
|
2.19.0
|
|
|