Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-09-30 07:27:28 +02:00
Code Issues Projects Releases Wiki Activity

Fix patches

Browse Source
This commit is contained in:
LinsaFTW 2023-03-15 13:58:34 -03:00
parent ffaadc8e94
commit 6c8e00ab52
2 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Waterfall-Proxy-Patches/0001-FlameCord-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From dd46a5fceccb1bc93c8456538a6e3cee9ec8ab28 Mon Sep 17 00:00:00 2001
From f549424aed518d36fb5d4b9ba3a6f42ca6559ba6 Mon Sep 17 00:00:00 2001
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
Date: Wed, 16 Dec 2020 17:59:15 +0800
Subject: [PATCH] FlameCord POM Changes
@ -6,10 +6,10 @@ Subject: [PATCH] FlameCord POM Changes
diff --git a/flamecord/pom.xml b/flamecord/pom.xml
new file mode 100644
index 00000000..6cb405a8
index 00000000..20edd900
--- /dev/null
+++ b/flamecord/pom.xml
@@ -0,0 +1,57 @@
@@ -0,0 +1,44 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
@ -42,19 +42,6 @@ index 00000000..6cb405a8
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+<<<<<<< Updated upstream
+=======
+ <dependency>
+ <groupId>com.maxmind.db</groupId>
+ <artifactId>maxmind-db</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ <scope>compile</scope>
+ </dependency>
+>>>>>>> Stashed changes
+ </dependencies>
+
+ <build>

26
Waterfall-Proxy-Patches/0028-Antibot-System.patch
View File

@ -1,27 +1,27 @@
From b94c0c4c774f0bf58f026ebf32bb36d1579ba240 Mon Sep 17 00:00:00 2001
From e5469d2ebf0b560f5faa4f8c94a743bd3e12264e Mon Sep 17 00:00:00 2001
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
Date: Fri, 4 Mar 2022 13:35:53 -0300
Subject: [PATCH] Antibot System
diff --git a/flamecord/pom.xml b/flamecord/pom.xml
index 6cb405a8..95bdf348 100644
index 20edd900..95bdf348 100644
--- a/flamecord/pom.xml
+++ b/flamecord/pom.xml
@@ -30,8 +30,6 @@
@@ -30,6 +30,16 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
-<<<<<<< Updated upstream
-=======
<dependency>
<groupId>com.maxmind.db</groupId>
<artifactId>maxmind-db</artifactId>
@@ -42,7 +40,6 @@
<artifactId>netty-handler</artifactId>
<scope>compile</scope>
</dependency>
->>>>>>> Stashed changes
+ <dependency>
+ <groupId>com.maxmind.db</groupId>
+ <artifactId>maxmind-db</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>