459987d69f
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
26 lines
793 B
Diff
26 lines
793 B
Diff
From 2c68f0bd180e1a053dd2b9e87ff0f4e1d18ca09a Mon Sep 17 00:00:00 2001
|
|
From: Minecrell <minecrell@minecrell.net>
|
|
Date: Thu, 21 Sep 2017 16:33:35 +0200
|
|
Subject: [PATCH] Include Log4J2 SLF4J implementation
|
|
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
index ed920ac4a0..b28f8e0929 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -62,6 +62,12 @@
|
|
<version>2.8.1</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
+ <dependency>
|
|
+ <groupId>org.apache.logging.log4j</groupId>
|
|
+ <artifactId>log4j-slf4j-impl</artifactId>
|
|
+ <version>2.8.1</version>
|
|
+ <scope>runtime</scope>
|
|
+ </dependency>
|
|
<dependency>
|
|
<groupId>org.apache.logging.log4j</groupId>
|
|
<artifactId>log4j-iostreams</artifactId>
|
|
--
|
|
2.19.0
|
|
|