mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-09-30 07:27:28 +02:00
Make waterfall-super the parent of waterfall-parent
This commit is contained in:
parent
cbe6a1b3f5
commit
ea2c109864
@ -1,4 +1,4 @@
|
|||||||
From 9c75ec25896ccbd216591fcfa52de66d67cbfe36 Mon Sep 17 00:00:00 2001
|
From ba49e7fc3950ef11d37c43ccfe77bf8286d7f942 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
|
||||||
@ -492,11 +492,20 @@ index 940d257..18861da 100644
|
|||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
diff --git a/pom.xml b/pom.xml
|
diff --git a/pom.xml b/pom.xml
|
||||||
index 7f9564c..10ddfab 100644
|
index 7f9564c..569c424 100644
|
||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -9,18 +9,18 @@
|
@@ -4,23 +4,24 @@
|
||||||
<version>9</version>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
<parent>
|
||||||
|
- <groupId>org.sonatype.oss</groupId>
|
||||||
|
- <artifactId>oss-parent</artifactId>
|
||||||
|
- <version>9</version>
|
||||||
|
+ <groupId>io.github.waterfallmc</groupId>
|
||||||
|
+ <artifactId>waterfall-super</artifactId>
|
||||||
|
+ <version>dev-SNAPSHOT</version>
|
||||||
|
+ <relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
- <groupId>net.md-5</groupId>
|
- <groupId>net.md-5</groupId>
|
||||||
@ -522,7 +531,7 @@ index 7f9564c..10ddfab 100644
|
|||||||
</organization>
|
</organization>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
@@ -32,7 +32,19 @@
|
@@ -32,7 +33,19 @@
|
||||||
|
|
||||||
<developers>
|
<developers>
|
||||||
<developer>
|
<developer>
|
||||||
@ -543,7 +552,7 @@ index 7f9564c..10ddfab 100644
|
|||||||
</developer>
|
</developer>
|
||||||
</developers>
|
</developers>
|
||||||
|
|
||||||
@@ -51,24 +63,36 @@
|
@@ -51,24 +64,36 @@
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<scm>
|
<scm>
|
||||||
@ -587,7 +596,7 @@ index 7f9564c..10ddfab 100644
|
|||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
@@ -117,36 +141,14 @@
|
@@ -117,36 +142,14 @@
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
@ -627,7 +636,7 @@ index 7f9564c..10ddfab 100644
|
|||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
<pluginManagement>
|
<pluginManagement>
|
||||||
@@ -181,4 +183,49 @@
|
@@ -181,4 +184,49 @@
|
||||||
</plugins>
|
</plugins>
|
||||||
</pluginManagement>
|
</pluginManagement>
|
||||||
</build>
|
</build>
|
||||||
|
@ -1,12 +1,9 @@
|
|||||||
From 21d3ffc5849abc92929e2e769cb51e392975cbf7 Mon Sep 17 00:00:00 2001
|
From 7c409c20042b2ea819c4b08165d8b4387384981f 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] Improve Netty update
|
Subject: [PATCH] Don't access a ByteBuf's underlying array
|
||||||
|
|
||||||
ORIGINAL PATCH - Upgrade to netty 4.1
|
It returns the underlying array storage, and does *not* return a view of the buffer as an array
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
|
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
|
||||||
index 6dcdece..e67773d 100644
|
index 6dcdece..e67773d 100644
|
||||||
@ -59,7 +56,7 @@ index 2014b0c..6b77d90 100644
|
|||||||
|
|
||||||
user.setDimension( login.getDimension() );
|
user.setDimension( login.getDimension() );
|
||||||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
|
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
|
||||||
index 22f1045..cd680f5 100644
|
index c2dd942..c0a5061 100644
|
||||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
|
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
|
||||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
|
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
|
||||||
@@ -240,7 +240,7 @@ public class DownstreamBridge extends PacketHandler
|
@@ -240,7 +240,7 @@ public class DownstreamBridge extends PacketHandler
|
||||||
@ -89,5 +86,5 @@ index 7fd2ff7..a70a215 100644
|
|||||||
{
|
{
|
||||||
@Override
|
@Override
|
||||||
--
|
--
|
||||||
2.7.4 (Apple Git-66)
|
2.10.0
|
||||||
|
|
Loading…
Reference in New Issue
Block a user