Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-01-08 08:57:39 +01:00
Code Issues Projects Releases Wiki Activity

Fix crash on startup (#743)

Browse Source
This commit is contained in:
Noah van der Aa 2022-06-07 19:44:58 +02:00 committed by GitHub
parent 958ae29cab
commit 9b0080a3ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BungeeCord-Patches/0002-Copy-license-files-into-jar.patch
View File

@ -1,14 +1,14 @@
From 642384e902e7533cb16d113de3ae970be011532f Mon Sep 17 00:00:00 2001 From 9023de96647d320da12a0d65285f26e18ef4385b Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu> From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Wed, 18 Jul 2018 20:23:03 +0300 Date: Wed, 18 Jul 2018 20:23:03 +0300
Subject: [PATCH] Copy license files into jar Subject: [PATCH] Copy license files into jar
diff --git a/proxy/pom.xml b/proxy/pom.xml diff --git a/proxy/pom.xml b/proxy/pom.xml
index a86eb68c..82366109 100644 index a86eb68c..0202f4f0 100644
--- a/proxy/pom.xml --- a/proxy/pom.xml
+++ b/proxy/pom.xml +++ b/proxy/pom.xml
@@ -117,4 +117,23 @@ @@ -117,4 +117,26 @@
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@ -17,6 +17,9 @@ index a86eb68c..82366109 100644
+ <build> + <build>
+ <resources> + <resources>
+ <resource> + <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>../</directory> + <directory>../</directory>
+ <includes> + <includes>
+ <include>LICENSE</include> + <include>LICENSE</include>

4
BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
View File

@ -209,7 +209,7 @@ new file mode 100644
index 00000000..e32dd7b5 index 00000000..e32dd7b5
--- /dev/null --- /dev/null
+++ b/log4j/src/main/resources/log4j2.xml +++ b/log4j/src/main/resources/log4j2.xml
@@ -0,0 +1,24 @@ @@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="warn" shutdownHook="disable"> +<Configuration status="warn" shutdownHook="disable">
+ <Appenders> + <Appenders>
@ -232,8 +232,6 @@ index 00000000..e32dd7b5
+ </Root> + </Root>
+ </Loggers> + </Loggers>
+</Configuration> +</Configuration>
+io/github/waterfallmc/waterfall/log4j/WaterfallLogger.class
+io/github/waterfallmc/waterfall/log4j/Log4JLogHandler.class
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index fad424b6..2b544c23 100644 index fad424b6..2b544c23 100644
--- a/pom.xml --- a/pom.xml