Upstream/BungeeCord
1
0
Fork 0
mirror of https://github.com/SpigotMC/BungeeCord.git synced 2024-11-17 15:55:13 +01:00
Code Issues Projects Releases Wiki Activity
1,732 Commits 20 Branches 6 Tags 17 MiB
a7c6edeb63
Commit Graph

1134 Commits

Author SHA1 Message Date
NayXegp
6c44ccd597 #2527: Minor cosmetic cleanups to imports etc 
Please see https://github.com/SpigotMC/BungeeCord/pull/2527
 2018-11-02 18:06:56 +11:00
md_5
ed6b03d24a Always use root locale for case conversions 2018-10-28 12:10:34 +11:00
md_5
1c5bff7ed7 Minecraft 1.13.2 support 2018-10-23 06:00:00 +11:00
NayXegp
41f8eb68c9 #2529: Use single legacy kicker instance for all channels 2018-09-26 11:16:46 +10:00
NayXegp
9886021428 #2521: Using replace instead of replaceAll 2018-09-05 07:51:23 +10:00
NayXegp
ba0739798a #2494: Add an option to disable pings in log 2018-08-29 07:53:52 +10:00
JoJoDeveloping
16b3490576 #2520: Fix ConcurrentModificationException when tasks are cancelled during shutdown 2018-08-29 07:47:12 +10:00
md_5
1bb826109c Minecraft 1.13.1 support 2018-08-23 20:52:25 +10:00
Mystiflow
715ec07a28 #2447: Add API for fluent server connect requests 
API allows for more control over callback to see why the callback was performed whilst maintaining backwards compatibility
 2018-07-30 12:37:34 +10:00
md_5
d2cf50f9ee #2482: Fix error reading custom names 2018-07-23 12:44:42 +10:00
md_5
a710698277 #2482: Fix error in reading slots 2018-07-23 12:07:30 +10:00
md_5
176b75b97e #2477: Fix entity rewrites not applying 2018-07-23 11:12:20 +10:00
md_5
c9f22868b3 Revert "#2447: Add API for fluent server connect requests" 
This reverts commit 7ce9ae50e7.
 2018-07-22 20:13:30 +10:00
maol3
95ed7a5775 #2474: Allow ALL in the Message channel 2018-07-22 18:10:51 +10:00
Mystiflow
7ce9ae50e7 #2447: Add API for fluent server connect requests 
API allows for more control over callback to see why the callback was performed whilst maintaining backwards compatibility
 2018-07-22 18:04:43 +10:00
md_5
671c4d1341 Minecraft 1.13 support 2018-07-22 12:00:00 +10:00
Lucas Dallabona
ab810744ec #2458: Fix NPE when using null in tab list methods 2018-07-15 11:32:33 +10:00
md_5
b1cc72e212 Minecraft 1.13-pre7 support 2018-07-15 10:00:00 +10:00
md_5
fa542c70df Fix incorrect whitespacing 2018-07-09 12:52:53 +10:00
Minecrell
7410ce9077 #2449: Avoid stopping if already in progress 
Currently it is possible to stop the proxy multiple times, causing
the shutdown routines to be called twice. This doesn't make any
sense and may even cause problems with some plugins.

Cancel early if stopping is already in progress to avoid this.
 2018-07-09 09:57:21 +10:00
Nathan Poirier
7af538793c #2450: Instantiate PluginManager (and EventBus) after the BungeeCord Logger 2018-07-08 09:59:30 +10:00
md_5
76dc32ee32 Enable IPv6 networking stack 2018-06-20 15:43:57 +10:00
md_5
68103e9a8d Netty 4.1.25.Final; MySQL 5.1.46. 2018-06-03 10:32:47 +10:00
md_5
88bacf12a3 #2420: Cap forge packet queue size 2018-05-12 21:14:44 +10:00
md_5
e93323ddbc #2420: Disable forge support by default 2018-05-12 08:24:06 +10:00
Mystiflow
7241eb37c9 #2376 Add ServerConnectEvent Reason API 2018-04-01 09:34:27 +10:00
md_5
e690a7b389 #1959: Leave ping exception logging to plugins 2018-03-31 10:55:15 +11:00
games647
272258cf5a #2372: Add SettingsChangedEvent for client-side settings 2018-03-15 20:47:08 +11:00
Mystiflow
7ee0b6dccb #2378: Show supported servers in incorrect client kick messages 
This makes the message match vanilla Minecraft servers
 2018-03-07 13:29:43 +11:00
Joe
74e077e0fb #2362: Fixed tablist rewrite getting wrong field 
Also only sets the ping in right circumstances.
 2018-02-26 07:00:37 +11:00
Senmori
a3b44aa612 #2342: Add score and selector components to chat API 2018-02-19 11:48:22 +11:00
md_5
2d7c74eae5 Move chat component test to right place 2018-01-28 17:59:32 +11:00
md_5
9b2bb07d89 Fix some source code formatting 2018-01-28 10:23:52 +11:00
md_5
d600c9a526 #2323: Attempt to rewrite fishing hook data 2018-01-08 12:51:26 +11:00
md_5
050d935891 Update Netty / MySQL 2018-01-07 22:49:33 +11:00
md_5
3508bf6c85 Add console command completion 2018-01-07 22:46:52 +11:00
md_5
eb288a80c3 Remove obsolete tab lists 2017-12-01 12:25:59 +11:00
Zhang
ed23e3b3d1 #2296: Fix tab list NPE w/ some offline mode clients 2017-12-01 12:25:39 +11:00
md_5
1dbfcfb0b5 #2297: Use server field on DownstreamBridge 2017-12-01 12:23:07 +11:00
md_5
4c84f37fd2 mysql-connector-java 5.1.44 2017-11-18 17:14:46 +11:00
md_5
2e826a15e7 Make greload reload custom messages.properties 2017-11-10 11:21:58 +11:00
md_5
0fc5694b6a Fix some compiler warnings 2017-10-28 17:08:05 +11:00
md_5
9a7bf0a361 #2254: Explicitly note config issues are not bugs 2017-10-26 21:18:16 +11:00
md_5
8d49424226 #2261: Don't send any keep alive to server if invalid 2017-09-23 17:14:03 +10:00
md_5
69bbc3a71e Invalidate ping when spoof sent 2017-09-23 15:05:50 +10:00
md_5
af8d1af635 Initialize ping to -1 2017-09-23 13:56:23 +10:00
md_5
23554239d0 #2259: Have proxy handle keepalives 2017-09-23 13:18:43 +10:00
md_5
61cb2df9f3 #2258: Fix missed packet ID 2017-09-19 08:04:44 +10:00
md_5
0eaabdf5ca Update to Minecraft 1.12.2 2017-09-18 20:00:00 +10:00
Mystiflow
3db9fb1b69 #2255: Fix ComponentBuilder clone constructor 
* Fix ComponentBuilder clone constructor #2255
* Fix appending text to a ComponentBuilder if current is not a TextComponent
 2017-09-16 16:06:51 +10:00
Virizion
ef326dba19 Send the correct username when connecting to a server (#2242) 2017-09-05 19:33:10 +10:00
md_5
d7010d629d Fix mismatched system properties 2017-09-04 18:15:23 +10:00
md_5
bd5a7e5b26 #2228: Implement basic backpressure on client 2017-08-18 18:27:25 +10:00
Mystiflow
fd675022c0 Allow appending BaseComponent arrays in ComponentBuilder 2017-08-13 12:40:44 +10:00
Mystiflow
a1f9c2e7d4 Disable plugins before shutting down EventLoops (#2214) 
Because disabling plugins also cancels any pending tasks, there will be no task accessing the eventLoops.

Reimplementation of #1578, fixes #1403
 2017-08-09 22:13:25 +10:00
md_5
db266a8484 Use newer writeAndFlush method 2017-08-09 22:05:06 +10:00
md_5
828e45651e Client defaults to right hand 2017-08-09 16:51:45 +10:00
Foorack
dbf20957a9 Expand API to get all player sent settings 2017-08-09 16:38:03 +10:00
md_5
da88d5c502 Formatting & dependency updates 2017-08-06 11:19:08 +10:00
Mystiflow
2ae8ba0afc Various scoreboard improvements. (#2204) 
- Correctly remove objectives that use heart type.
- Also sends remove score packets on server switch.
- Players are only removed if Team packet mode is 4.
 2017-08-04 16:10:10 +10:00
md_5
017f3a2424 Update to Minecraft 1.12.1 2017-08-03 23:00:00 +10:00
md_5
daac8d85e2 Add support for PROXY protocol 2017-07-01 09:38:27 +10:00
md_5
a5ffeae757 Replace OpenSSL native cipher with static mbed TLS for maximum compat 2017-06-29 08:52:13 +10:00
md_5
6958943123 Use property to skip deploy to eliminate warnings, update lombok 2017-06-21 19:45:03 +10:00
md_5
eab710b0aa #2154: Always send action bar differently to account for colours 2017-06-08 19:02:37 +10:00
md_5
ff891c000e Update to Minecraft 1.12 2017-06-08 18:00:00 +10:00
BlackHole
4db53525bf Correct some packet IDs in 1.12 EntityMap 2017-05-23 06:35:01 +10:00
md_5
09ee2b1644 Update to Minecraft 1.12-pre5 
Obsoletes 1.12-pre2
 2017-05-19 21:00:04 +10:00
md_5
16d261553c Minecraft 1.12-pre2 Support 2017-05-14 12:00:00 +10:00
BlackHole
5bc189fbb7 Use player name casing from LoginResult 2017-05-09 12:49:48 +10:00
md_5
806a6dfaca Add Mojang prevent_proxy_connections option. 2017-04-28 21:48:41 +10:00
Molek
bfab8a1d9c Index UUIDs to speed up player queries (#2121) 2017-04-26 16:39:49 +10:00
md_5
6908e700e6 Jenkins modules are now https. 2017-02-12 10:59:10 +11:00
md_5
01f44483df #2055: Mark inactive channels as closed 2017-02-07 08:58:37 +11:00
md_5
0b8ab8eccc Update Netty; jline; MySQL 2017-01-30 18:27:13 +11:00
MisterFrans
db1516ba00 Add "Not authenticated with Minecraft.net" message in the messages.properties (#2044) 2017-01-18 08:36:00 +11:00
md_5
81de9d5a63 #2041: More robust closing code 2017-01-16 10:11:17 +11:00
md_5
c1bdbef9cf Give delayed close packets time to send on /end 2017-01-16 10:00:27 +11:00
md_5
6104354fa1 Implement basic entity metadata mapping to remap fireworks for boosting. 2016-12-22 22:29:00 +11:00
md_5
21411af74d Add support for Minecraft 1.11.1 2016-12-21 06:23:51 +11:00
md_5
129693f533 #2026: Try multiple priorities as fallback 2016-12-19 23:09:18 +11:00
md_5
4fa9961c15 #1958: Negative compression thresholds disable compression like Vanilla 2016-12-16 10:43:29 +11:00
Gabscap
ea6680281f Allow cancelling LoginEvents with component reasons. 
Ultimately this PR was selected as it better matched the existing code in terms of using lombok and not adding incomplete interfacing.
If for some reason a common interface is required, this can be implemented later.

Thanks to yawkat also for the PR in #1336 -- it was difficult for the merger to compromise between this and #1957
 2016-12-01 10:12:54 +11:00
md_5
2171ca9f51 Fix confusing use of static subclass methods 2016-12-01 09:46:34 +11:00
md_5
4d004d5fed Throw exception when ServerConnectEvent is handled badly 2016-11-25 10:42:30 +11:00
Mystiflow
f3e5f34aeb Allow chat messages longer than 100 characters on > 1.11 clients 2016-11-15 09:37:20 +11:00
md_5
9ecdde2292 Add support for Minecraft 1.11 
Improve QueryHandler session handling as suggested by IchBinJoe
 2016-11-15 02:40:46 +11:00
md_5
987f2d0eb2 Remove unused connect_kick_outdated_forge message 2016-11-06 11:47:27 +11:00
Mystiflow
908b7f7374 Use server priority for downstream kicks too (#1978) 2016-11-06 11:25:46 +11:00
Mystiflow
18f57f24fa Fix issue pointed out by Supereg; store dimension on first join too (#1979) 
* Only double switch if the dimension is the same.

According to the protocol, a double respawn packet is only needed to be
sent if from the same dimension, so by storing the last known dimension,
we are able to compare and avoid the double packet.

This also maintains the same behaviour for Spigot
ad2f806097

* Store current dimension on first disconnect too
 2016-10-30 08:28:11 +11:00
Mystiflow
812141f400 Only double switch if the dimension is the same. (#1977) 
According to the protocol, a double respawn packet is only needed to be
sent if from the same dimension, so by storing the last known dimension,
we are able to compare and avoid the double packet.

This also maintains the same behaviour for Spigot
ad2f806097
 2016-10-29 17:59:38 +11:00
md_5
75b7fdac58 Fix stray imports in proxy 2016-10-19 21:15:00 +11:00
md_5
5c551fd899 Improve Quality of Channel Close Code 
* Don't double disconnect due to client exceptions
* Add generic delayed close method
* Properly format imports in changed files
 2016-10-19 21:08:38 +11:00
md_5
0581e49d49 Update Netty 2016-08-30 20:22:02 +10:00
md_5
5c809c2499 #1945: Relay MC|Brand messages 2016-08-26 16:11:38 +10:00
md_5
356ca08337 #1544: Reduce verbosity of common/harmless exception during initial connection 2016-08-21 09:07:33 +10:00
md_5
b86a33d058 #1941: Fix modded client+server in some cases 2016-08-21 09:02:37 +10:00
md_5
504d3c0529 #1939: Fix server brand; prevent bungee-bungee connections. 2016-08-20 11:43:48 +10:00
md_5
e7be3c6b1e Allow PluginMessages to be handled when no server connected 2016-08-11 23:02:29 +10:00
md_5
3a0b0aa116 #1930: Don't handle upstream packets if no server connected 2016-08-03 17:03:06 +10:00
md_5
c43f25e23b Fix MC|Brand array having trailing zeroes. 2016-07-15 23:45:38 +10:00
md_5
eca99576a0 Move net.md_5.bungee.log to its own module. 
API subject to change and should not be used externally.
 2016-07-11 11:12:35 +10:00
BlackHole
1250088f98 Correctly show outdated_client and outdated_server messages 
If the client protocol version is not supported, show outdated_server message only if client version is higher than highest supported protocol version, outdated_client message else.
 2016-06-29 09:15:17 +10:00
md_5
507a98f28f #1859: Rewrite second leash int 2016-06-29 09:14:03 +10:00
md_5
a8c529eca5 #1859: Entity attach is an int 2016-06-28 15:28:28 +10:00
misterT2525
c5ac5a0d17 #1859: Fix EntityMap for leads. 2016-06-27 14:20:02 +10:00
md_5
e4cf010bda Update to Minecraft 1.10 2016-06-09 11:44:06 +10:00
md_5
2df29701ed #1866: Correct throttle 2016-05-15 16:01:58 +10:00
PunKeel
d9a8311b8e Use expireAfterWrite to perform throttle 2016-05-15 14:54:18 +10:00
Zartec
d14b96d55e Added separate exception for packet overflows to limit log output. 
Attacking a server with a hacked client causes the log to print a huge amount of stacktraces. This will limit the log output to the error message.
 2016-05-15 14:52:41 +10:00
md_5
41621193ec #1862: Support 1.7 pings 2016-05-15 14:52:01 +10:00
Thinkofname
a12ac37cc3 Support Minecraft 1.9.4 and tidy up packet handling 2016-05-10 21:51:39 +10:00
BuildTools
4c7c64c9b8 #1848: Added missing call to UserConnection.connect callback for "already_connected" and "already_connecting" 2016-05-05 22:32:24 +10:00
md_5
80b3135a93 Fix formatting 2016-04-24 22:31:04 +10:00
md_5
1cd3e42182 #1841: Fix disabled throttle and improve code. 2016-04-24 22:18:23 +10:00
Janmm14
2e8ed1cfba Reimplement join throttle. 2016-04-24 11:56:24 +10:00
md_5
b9a98c88ba Java 7 support 2016-04-24 11:39:23 +10:00
md_5
0b554be10a Strip / add velocity to SpawnEntity packets that require it when rewritten 2016-04-24 09:39:22 +10:00
Jofkos
f070e2d064 Added ansi "erase line" 2016-04-08 07:42:11 +10:00
Thinkofname
b6b015fe1f Ensure we get a 1024 bit RSA key (Fixes #1814) 2016-03-31 16:12:30 +01:00
Thinkofname
d1a1e87ab5 Support Minecraft 1.9.2 2016-03-30 16:57:54 +01:00
md_5
6b4e285186 1.9.1 support 2016-03-30 15:59:51 +01:00
md_5
f265f7c594 #901: Better custom messages support 2016-03-24 14:15:16 +11:00
md_5
859d176c93 Update README.md and fix minor formatting error. 2016-03-09 18:16:22 +11:00
Tux
52d66897e4 Raise an error if a server in the priority list is undefined 2016-03-06 16:10:31 +11:00
md_5
8b327708ee #1335: Remove 16 char displayname limit 2016-03-05 18:56:32 +11:00
Zartec
903ada06f0 Sould break the priority lookup after server found 
If the list would look like this

- test1 -> 1.8 -> ServerKickEvent cancelled -> reason set to "outdated"
- test2 -> 1.8
- test3 -> 1.9

and a player joins with version 1.8 he would never be connected to test2 because the server test2 is not equal to test1 and the server test3 is not equal to test1.
So test3 is the last in the while loop and would be used also if another server with higher priority matches the requirements.
 2016-03-04 07:10:59 +11:00
Youri Kersten
a7664a5559 Remove any tracked bossbars when a client switches servers. 2016-03-03 18:57:48 +11:00
md_5
46e7f2dfc9 Only allow ServerUnique tab lists as per 1.8 due to incomplete functionality. 2016-03-02 20:20:55 +11:00
Youri Kersten
b6671cd00c Send action bar messages using BaseComponent for 1.9 clients 
Action Bar packets in 1.9 now correctly support the JSON format, however sending them the 1.8 way will kick the client. This keeps the compatibility with 1.8 clients with the version check whilst correctly sending the packet to 1.9 clients.
 2016-03-01 19:32:19 +11:00
Thinkofdeath
7926230682 #1765: Fix ServerInfo.ping to handle chat components. 2016-03-01 12:38:19 +11:00
md_5
dd66e3068a Fix priority selection not playing nicely with reconnect handlers. 2016-03-01 12:34:50 +11:00
md_5
04a6eff14c Don't handle exceptions for obsolete server connectors. 2016-03-01 11:53:59 +11:00
md_5
05de455a9c Update to Minecraft 1.9 2016-03-01 09:31:12 +11:00
Thinkofdeath
12a7b7afc3 Add support for 15w33c and multiple fallback servers 2016-03-01 09:31:12 +11:00
Thinkofdeath
dfaa687f71 Remove 1.7.x Support 2016-03-01 09:31:12 +11:00
md_5
219819b738 Replace default/fallback servers with a server priority list. 2016-03-01 09:31:12 +11:00
md_5
0646a3090a Fix scoreboards / tab lists getting out of sync due to race conditions / overlap. 2016-02-19 09:07:12 +11:00
md_5
afc02082e6 Make it clear when users connected Bungee to itself. 2016-02-17 10:34:04 +11:00
Tux
848cad2a59 Fix cancelling TabCompleteEvent. 
The packet would get sent regardless if the event was cancelled, only if there were no suggestions available.
 2016-02-07 17:44:07 +11:00
Thinkofdeath
a0f2c42d38 Clear the address cache entry when a connection fails 
Should help solve the issues caused by mojang swapping the ip address of
the session server.
 2016-02-05 10:19:31 +11:00
md_5
e556fd7150 Add Connection.isConnected()Z API. 
Idea from kamcio96 in #1693
 2016-02-05 10:09:47 +11:00
md_5
841c81cdc4 [#1714] Make a copy of the main Minecraft buffer as EntityMap.rewriteVarInt may require more bytes than available. 2016-01-24 19:45:02 +11:00
md_5
052131c1fa Reduce amount of memcpy within proxy pipeline. 2016-01-24 11:22:39 +11:00
kamcio96
83e27f07e6 Use static instances of EntityMap 2016-01-16 12:44:32 +11:00
md_5
5cff0b2171 Remove redundant synchronization on ServerConnection.disconnect 2016-01-16 12:33:42 +11:00
md_5
2c86592ecd [#1649] Don't parse disconnect reason for servers. 
Reported by @kamcio96
 2016-01-16 12:29:13 +11:00
md_5
f5552963b8 Update Netty and enable EPoll transport. 2016-01-16 11:37:17 +11:00
Tux
a1895c556f Make BoundedArrayList follow the old behavior. 
Unit tests have been included.
 2016-01-11 14:09:07 +11:00
md_5
aa214c0b54 [#1695] Use BoundedArrayList to cap list size for REGISTER channels. 2016-01-10 19:00:00 +11:00