Remove uneeded patch and call UUIDUtils.toMojangUUID() directly

Closes #8 even more
This commit is contained in:
Techcable 2016-05-31 11:42:10 -06:00
parent f160b2169e
commit c6ee5b53a7
No known key found for this signature in database
GPG Key ID: 091A03B91D7FCE68
26 changed files with 33 additions and 65 deletions

View File

@ -1,33 +0,0 @@
From c5c7f68d947f366fef739e0ac3a655baed507bfe Mon Sep 17 00:00:00 2001
From: Jadon Fowler <jadonflower@gmail.com>
Date: Tue, 31 May 2016 00:36:01 -0600
Subject: [PATCH] Optimize conversion to Mojang-style UUIDs by avoiding regex
diff --git a/api/src/main/java/net/md_5/bungee/api/ServerPing.java b/api/src/main/java/net/md_5/bungee/api/ServerPing.java
index 314a1d2..6804ad9 100644
--- a/api/src/main/java/net/md_5/bungee/api/ServerPing.java
+++ b/api/src/main/java/net/md_5/bungee/api/ServerPing.java
@@ -73,7 +73,7 @@ public class ServerPing
public String getId()
{
- return uniqueId.toString().replaceAll( "-", "" );
+ return uniqueId.toString().replace( "-", "" );
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index dab6ef2..ad19168 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -603,7 +603,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String getUUID()
{
- return uniqueId.toString().replaceAll( "-", "" );
+ return uniqueId.toString().replace( "-", "" );
}
@Override
--
2.8.3

View File

@ -1,4 +1,4 @@
From 84dc97a63f6f751464fcef7853dbc375c4a10439 Mon Sep 17 00:00:00 2001
From 086218556d597da5c0c353e992df0e558abe20e6 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Mon, 14 Mar 2016 15:40:44 -0700
Subject: [PATCH] Optimize uuid conversions
@ -204,7 +204,7 @@ index 0000000..7258a26
+}
\ No newline at end of file
diff --git a/api/src/main/java/net/md_5/bungee/Util.java b/api/src/main/java/net/md_5/bungee/Util.java
index 37e12e9..b268bef 100644
index 86a0055..6c9c6d6 100644
--- a/api/src/main/java/net/md_5/bungee/Util.java
+++ b/api/src/main/java/net/md_5/bungee/Util.java
@@ -1,11 +1,15 @@
@ -232,13 +232,14 @@ index 37e12e9..b268bef 100644
}
/**
@@ -78,5 +82,5 @@ public class Util
@@ -78,6 +82,6 @@ public class Util
*/
public static UUID getUUID(String uuid)
{
- return UUID.fromString( uuid.substring( 0, 8 ) + "-" + uuid.substring( 8, 12 ) + "-" + uuid.substring( 12, 16 ) + "-" + uuid.substring( 16, 20 ) + "-" + uuid.substring( 20, 32 ) );
+ return UUIDUtils.fromString(uuid);
}
}
--
2.8.3

View File

@ -1,4 +1,4 @@
From 181fb185d832bbea34d4744bb7e426d9ff6bc216 Mon Sep 17 00:00:00 2001
From c95af7c87401614b8c9d7fc0440f83d90fccdc3e Mon Sep 17 00:00:00 2001
From: Daniel Naylor <git@drnaylor.co.uk>
Date: Sun, 9 Aug 2015 13:43:57 +0100
Subject: [PATCH] Add support for FML with IP Forwarding enabled

View File

@ -1,4 +1,4 @@
From 6ee13e629b72a93e352cea0d99d142a066d12bee Mon Sep 17 00:00:00 2001
From 89a2c870ce5222a1f0b8c0630f834f0fdcf7a25a Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 17:36:31 -0600
Subject: [PATCH] Better unit tests for Chat API

View File

@ -1,4 +1,4 @@
From 7937df226bd632a263f9db241fac040845cb916c Mon Sep 17 00:00:00 2001
From 75a68ebcaaa12cd678da120ca24b3198d1c183cb Mon Sep 17 00:00:00 2001
From: Iceee <andrew@optic.tv>
Date: Mon, 6 Jul 2015 18:59:29 -0500
Subject: [PATCH] Don't allow channel buffers to grow beyond a reasonable limit

View File

@ -1,4 +1,4 @@
From e3161d727171388b974b829ae6ca08abeb71fa79 Mon Sep 17 00:00:00 2001
From 08114b37246a6c626a09d2c90fc01d69437a0da9 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Thu, 28 Jan 2016 15:13:29 -0700
Subject: [PATCH] Allow removing servers or changing addresses on reload

View File

@ -1,4 +1,4 @@
From 81c24fbb9f86c8bd14cc33208504f53147235cff Mon Sep 17 00:00:00 2001
From 37ccc36c7cd188e0ef35944c3f199c9c50f6b6f4 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Sun, 28 Feb 2016 22:46:22 -0700
Subject: [PATCH] Use ASM for events, via the Event4J library

View File

@ -1,4 +1,4 @@
From f78252248fff2adf844a59aa117d4eabda721144 Mon Sep 17 00:00:00 2001
From 4c762f426feb38a6d46bec74316d7d3035a01282 Mon Sep 17 00:00:00 2001
From: Harry <me@harry5573.uk>
Date: Wed, 24 Feb 2016 17:16:23 +0000
Subject: [PATCH] Enable TCP_NODELAY.

View File

@ -1,4 +1,4 @@
From 01c78e08ab372071eb749652dc8bcbdeace6ab23 Mon Sep 17 00:00:00 2001
From be615eb7dd1349ff58bdd5209e5f8b5d29e8e8a2 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 18:05:33 -0600
Subject: [PATCH] Micro-optimizations

View File

@ -1,4 +1,4 @@
From e41f8d2465c135cede5d3065647c943c2e3e5435 Mon Sep 17 00:00:00 2001
From 4dffe93274f4dc09c8ee25379bdceec8b2e9df99 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Thu, 19 May 2016 17:09:22 -0600
Subject: [PATCH] Allow invalid packet ids for forge servers

View File

@ -1,4 +1,4 @@
From 5657f0dd4286279c4d4ff0ac8a659ca1818fa954 Mon Sep 17 00:00:00 2001
From 49e4855a885268c5624f345203d6e93b06a7f45c Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Fri, 12 Feb 2016 23:55:53 -0500
Subject: [PATCH] Resolve sendData() deadlocks

View File

@ -1,4 +1,4 @@
From 4b36feac0d134f081b418653e41547fb5b243081 Mon Sep 17 00:00:00 2001
From d89711fa5924cebb2002c5f93ae140d6d524bb84 Mon Sep 17 00:00:00 2001
From: Johannes Donath <johannesd@torchmind.com>
Date: Sat, 4 Jul 2015 06:31:33 +0200
Subject: [PATCH] Add basic support for configurable tab-complete throttling

View File

@ -1,4 +1,4 @@
From 41ff2cd5701b5c40003385c1901df3b39045365a Mon Sep 17 00:00:00 2001
From 846293ecda045e28cf3b61d9bad5dcd3b160e006 Mon Sep 17 00:00:00 2001
From: Harry <me@harry5573.uk>
Date: Tue, 26 Jan 2016 01:01:57 +0000
Subject: [PATCH] Don't create a new KickStringWriter for each new connection.

View File

@ -1,4 +1,4 @@
From 538e4649bc72a9a167768f0fb1bef46c4040e863 Mon Sep 17 00:00:00 2001
From c0255a9a2577c5fbea5b490b8cbd34a80ac26436 Mon Sep 17 00:00:00 2001
From: Janmm14 <computerjanimaus@yahoo.de>
Date: Sat, 12 Dec 2015 23:43:30 +0100
Subject: [PATCH] Optional server list ping logging.
@ -85,7 +85,7 @@ index cb9dbaf..7ba0bcb 100644
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index ad19168..2056907 100644
index dab6ef2..c2348eb 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -277,19 +277,22 @@ public class InitialHandler extends PacketHandler implements PendingConnection

View File

@ -1,4 +1,4 @@
From 6d0fcbace0fb04518462a064d3f08de8e85ade3b Mon Sep 17 00:00:00 2001
From fffd6239429e262ba8e9f85b35aa1271137eb9bc Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 5 Oct 2015 23:20:54 -0400
Subject: [PATCH] Set a more reasonable Recycler Capacity

View File

@ -1,4 +1,4 @@
From be14a36864738f608de88028912627a57eb20515 Mon Sep 17 00:00:00 2001
From 647f79db76c3a12371eeab0beabe41760e8ad66e Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Sun, 14 Feb 2016 01:03:27 -0500
Subject: [PATCH] Reduce max log size to 8MB and don't append to existing log

View File

@ -1,4 +1,4 @@
From c45b17cb631a5cf8ff869199b2b6e1331a548474 Mon Sep 17 00:00:00 2001
From 033d667a3ecda5d349c5727133794c824c74dc84 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Sun, 7 Feb 2016 00:01:19 -0700
Subject: [PATCH] Add a property to accept invalid ping packets
@ -9,7 +9,7 @@ You can enable it by setting '-Dwaterfall.acceptInvalidPackets=true' at the comm
Fixes #23
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 2056907..53d7ef8 100644
index c2348eb..d841090 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -243,10 +243,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection

View File

@ -1,4 +1,4 @@
From 48727687f5d0091dc4a79106630aee820d464a6d Mon Sep 17 00:00:00 2001
From 8a8e96bb45c7af0b572fd10e5cc84dd2cee4d555 Mon Sep 17 00:00:00 2001
From: Jonas Konrad <me@yawk.at>
Date: Tue, 23 Jun 2015 21:56:13 +0200
Subject: [PATCH] Ignore incoming chat messages before connecting to the

View File

@ -1,4 +1,4 @@
From cd50f5e9403ffc31c760f29aa6fce77490ae5ac3 Mon Sep 17 00:00:00 2001
From 96a2e827533d4f8080bd915265e39923d389c256 Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com>
Date: Mon, 14 Mar 2016 15:59:52 -0700
Subject: [PATCH] Improve connection closing, fixing the kick delay.
@ -49,7 +49,7 @@ index c88ab49..9a13f5c 100644
if ( server != null )
{
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 53d7ef8..0b1be45 100644
index d841090..b27b447 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -136,8 +136,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection

View File

@ -1,4 +1,4 @@
From 465cc07d8909d48ac81e5a71916a8bc0b7e3a193 Mon Sep 17 00:00:00 2001
From 3bce4160dcec9fa20a364de0f514f5d2c8e8d85f Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com>
Date: Mon, 14 Mar 2016 16:07:20 -0700
Subject: [PATCH] Use a worker and a boss event loop group.

View File

@ -1,4 +1,4 @@
From 18a1e9fa9a98f93e8877616607b37cc92eaa07fb Mon Sep 17 00:00:00 2001
From ed18ef1b60b4cd24a47916696d8c1f3252e4d318 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Fri, 18 Mar 2016 10:53:24 -0700
Subject: [PATCH] Better Decompression Sanity

View File

@ -1,11 +1,11 @@
From 851c2b19e31527f7b758f9c924290ad0c950849d Mon Sep 17 00:00:00 2001
From 1f1df09244b1fe1746f9d48b000d2c54d86f64dc Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Sun, 20 Mar 2016 01:36:23 -0400
Subject: [PATCH] Better race condition check for disconnect()
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 0b1be45..9ced50c 100644
index b27b447..13a549a 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -8,6 +8,7 @@ import java.net.URLEncoder;

View File

@ -1,4 +1,4 @@
From da4c0a77fa856feae15b346aa2428714270afccf Mon Sep 17 00:00:00 2001
From 4710be5dc64500475e0f5ea7606619978081be0c Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Tue, 3 May 2016 20:31:52 -0700
Subject: [PATCH] Upgrade to netty 4.1
@ -7,7 +7,7 @@ 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/pom.xml b/pom.xml
index fda3278..d2f458a 100644
index badd9c4..eb5c2ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@

View File

@ -1,4 +1,4 @@
From ced5b9324cc6270083caa16674d09e78e8ae72cd Mon Sep 17 00:00:00 2001
From 0ee1851dd10b3146541b045ae233b03f74381291 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Tue, 5 Apr 2016 11:00:16 -0700
Subject: [PATCH] Print stack trace when the ByteBuf is not direct.

View File

@ -1,4 +1,4 @@
From bc91805c7d00866d7c320cf01ee5bc79e450cc72 Mon Sep 17 00:00:00 2001
From 0189e040175b33bfaaf9315fd902144d78470041 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Wed, 13 Apr 2016 14:00:40 -0400
Subject: [PATCH] Validate that chat messages are non-blank

View File

@ -1,4 +1,4 @@
From be2a4b8a6d0f1d6e2e4ceea0bf35a8c3209af118 Mon Sep 17 00:00:00 2001
From 7c7f35b10a044315fc067c505f1785585e721201 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Mon, 25 Apr 2016 23:46:00 -0700
Subject: [PATCH] Reduce the overhead of lots and lots of teams with the same