Commit Graph

25 Commits

Author SHA1 Message Date
Black Hole
1e2071e6a8 Since servers is mutable, lock on another Object: serversLock (#42)
* Since servers is mutable, lock on another Object: serversLock

* Make serversLock final
2016-06-29 19:54:36 -05:00
fuzzybot
d024f19ba5 Add build script and update README.md 2016-06-29 19:54:36 -05:00
fuzzybot
a7acead907 Fixed ci link 2016-06-29 19:54:36 -05:00
Jamie Mansfield
2a9bac3c50 Update upstream (#41) 2016-06-29 19:54:36 -05:00
Troy Frew
68fa9d3c9f Fire ServerKickEvent server crashes or shuts down too fast
Include the cause of the kick

Merges #39
2016-06-29 19:54:36 -05:00
PunKeel
1720a14e08 Store last known dimension and don't send useless respawn packets
Improves server switching without lossing the advantages of the Respawn package (reset entities, for instance)

Merges SpigotMC/BungeeCord#1426
2016-06-29 19:54:36 -05:00
Troy Frew
87ac8b1929 Remove nuneeded import in the netty 4.1 patch
Fixes #31 and merges #38
2016-06-29 19:54:35 -05:00
Troy Frew
34de9687e1 Add dynamic server addition/removal api patch (#37) 2016-06-29 19:54:35 -05:00
Jamie Mansfield
6b65e57f42
Update upstream 2016-06-28 16:04:33 +01:00
Jamie Mansfield
fe9e866d32 Update upstream (#34) 2016-06-27 08:47:38 -07:00
Jamie Mansfield
a64fd874f2 Update upstream (#33) 2016-06-21 23:08:55 -07:00
Jamie Mansfield
19c4c95325 Update upstream
Merges #25
2016-06-15 09:02:53 -07:00
Techcable
d5d0edbadd
Sleep deprevation is good because it keeps syntax errors in business 2016-06-08 23:12:58 -07:00
Techcable
629ab1e0b1
Updade bungeecord and use their 1.10 support 2016-06-08 23:08:37 -07:00
DoctorDark
d4938e82fe
Re-add the feature to let the console to tab complete commands
Fixes #16
2016-06-08 12:13:46 -07:00
joserobjr
06af55a425
Add support for Minecraft 1.10
Merges SpigotMC/BungeeCord#1881
2016-06-08 11:33:35 -07:00
Techcable
2de1d93d7f
Don't send KICK packets while in HANDSHAKE state
Fixes #12

Use a switch statement for checking if the state has a kick packet for better readibility.
2016-06-06 13:37:58 -06:00
Techcable
c5752cf13d
Give more information when to get packet id to help debug #12 2016-06-06 11:41:33 -06:00
Techcable
7d8e09b311
Improve applyPatches.sh
Get rid of all that crazy parenthesis stuff
2016-05-31 17:01:38 -06:00
Techcable
ca92e83419
Try and fix build 2016-05-31 13:11:28 -06:00
Techcable
2187ad029c
Always CAS the disconnecting variable when we disconnect.
When we changed the disconnect check to use proper concurrent behavior (using CAS), the disconnecting flag wasn't set the first time we disconnect because the OR short-circited the CAS.

Upstream doesn't have this issue because they don't set the flag in the if statement (with CAS), and therefore aren't short circuted.

I have no idea why this check was an OR statement in the first place, so maybe this will cause more crazy bugs.
2016-05-31 12:52:17 -06:00
Techcable
05fc872738
Make the Netty 4.1 upgrade one of the first patches
@aikar suggested this so patches don't have conflicts with netty 4.1
2016-05-31 12:49:57 -06:00
Techcable
c6ee5b53a7
Remove uneeded patch and call UUIDUtils.toMojangUUID() directly
Closes #8 even more
2016-05-31 12:46:47 -06:00
phase
f160b2169e Remove unneeded unit tests for unneeded UUID method
getMojangUUID was a replacement for the regex conversion of UUIDs to
Mojang's format. I have removed this method and the associated unit
tests because it is nothing more than a wrapper around String#replace.
This new patch simply replaces the call to String#replaceAll with a
call to String#replace. Patch 0011 was affected by this change, and has
been fixed.

Merges #9
2016-05-31 11:37:52 -06:00
Techcable
3809083007
Turn waterfall into a patch-based fork like Spigot and Paper (WIP)
Allows us to easily see and manage the diff with upstream.
Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history.

All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-30 14:51:51 -06:00