Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-28 21:25:47 +01:00
Code Issues Projects Releases Wiki Activity

Sleep deprevation is good because it keeps syntax errors in business

Browse Source
This commit is contained in:
Techcable 2016-06-08 23:12:58 -07:00
parent 629ab1e0b1
commit d5d0edbadd
No known key found for this signature in database
GPG Key ID: 091A03B91D7FCE68
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
BungeeCord-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From 5ebbae220ffc11ffe349d684135393689378750c Mon Sep 17 00:00:00 2001 From e719f30fe98f178110c6a8343c389829e93c4f9f Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 10:33:31 -0700 Date: Thu, 19 May 2016 10:33:31 -0700
Subject: [PATCH] POM Changes Subject: [PATCH] POM Changes
@ -445,13 +445,15 @@ index a3bd632..a2b422c 100644
<dependencies> <dependencies>
<dependency> <dependency>
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 299f6fa..2a78656 100644 index 299f6fa..309f43d 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -11,16 +11,18 @@ @@ -9,18 +9,18 @@
<version>9</version>
</parent>
<groupId>net.md-5</groupId> - <groupId>net.md-5</groupId>
<artifactId>bungeecord-parent</artifactId> - <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId> + <artifactId>waterfall-parent</artifactId>
<version>1.10-SNAPSHOT</version> <version>1.10-SNAPSHOT</version>
@ -473,7 +475,7 @@ index 299f6fa..2a78656 100644
</organization> </organization>
<licenses> <licenses>
<license> <license>
@@ -32,7 +34,13 @@ @@ -32,7 +32,13 @@
<developers> <developers>
<developer> <developer>
@ -488,7 +490,7 @@ index 299f6fa..2a78656 100644
</developer> </developer>
</developers> </developers>
@@ -50,24 +58,36 @@ @@ -50,24 +56,36 @@
</modules> </modules>
<scm> <scm>
@ -533,7 +535,7 @@ index 299f6fa..2a78656 100644
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
@@ -116,36 +136,14 @@ @@ -116,36 +134,14 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
@ -573,7 +575,7 @@ index 299f6fa..2a78656 100644
</plugin> </plugin>
</plugins> </plugins>
<pluginManagement> <pluginManagement>
@@ -180,4 +178,49 @@ @@ -180,4 +176,49 @@
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>

6
BungeeCord-Patches/0008-Upgrade-to-netty-4.1.patch
View File

@ -1,4 +1,4 @@
From 53e1968d08622b10c71a6b069a858d56b2566316 Mon Sep 17 00:00:00 2001 From c62c9a57d73ef1db2dbff33fd8e895af0ec1ce6f Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net> From: Techcable <Techcable@techcable.net>
Date: Tue, 3 May 2016 20:31:52 -0700 Date: Tue, 3 May 2016 20:31:52 -0700
Subject: [PATCH] Upgrade to netty 4.1 Subject: [PATCH] Upgrade to netty 4.1
@ -7,10 +7,10 @@ Don't access a ByteBuf's underlying array with ByteBuf.array()
- ByteBuf.array() returns the underlying array storage, and does *not* return a view of the buffer as an array - ByteBuf.array() returns the underlying array storage, and does *not* return a view of the buffer as an array
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 2a78656..8a352a7 100644 index 309f43d..6fe9ef4 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -84,7 +84,7 @@ @@ -82,7 +82,7 @@
<properties> <properties>
<build.number>unknown</build.number> <build.number>unknown</build.number>