Commit Graph

17 Commits

Author SHA1 Message Date
Jamie Mansfield
19d850ebb1
Merge upstream 2018-02-20 13:20:51 +00:00
Jamie Mansfield
7fcb9fbf8c
Merge upstream 2018-01-07 17:04:30 +00:00
Jamie Mansfield
60905d7d56
Merge upstream 2017-11-10 17:53:59 +00:00
Jamie Mansfield
b5d048b57a
Revert to BungeeCord behaviour for the 'not direct byte buf' business
Not worth the time wasted on closing invalid bug reports.
2017-10-23 19:53:51 +01:00
Jamie Mansfield
bfb622eb23
Merge upstream 2017-04-26 17:32:42 +01:00
Jamie Mansfield
c8fe40d640
I'm and idiot 2016-11-26 20:39:19 +00:00
Jamie Mansfield
bcad1e9b55
No need to relocate the metrics class
Different version of Git were constantely changing the Metrics patch - it wasn't worth it
2016-11-26 20:34:59 +00:00
Jamie Mansfield
51993973fc
Remove redundant patch. Fixes #98
Upstream resolved the issue 3a0b0aa116
2016-11-01 15:51:42 +00:00
Troy Frew
59f69a69c5
Upstream Merge 2016-10-30 10:46:05 -04:00
Techcable
124a8b6213 Fix ArrayIndexOutOfBoundsException in LowMemorySet
Fixes #86
2016-10-29 05:53:37 +00:00
Troy Frew
a1e3ee4799
Updated upstream. Moved our Disconnection patches to the fire-pit as there is some duplicate features from BungeeCord provided now. 2016-10-25 12:57:11 -04:00
Jamie Mansfield
44f56d895b
Update upstream 2016-10-11 22:45:06 +01:00
Jamie Mansfield
c369fa9f30
Fix the CI links 2016-08-12 19:41:16 +01:00
Techcable
29fc3a8f52
Update upsteram 2016-08-04 19:11:26 -07:00
Jamie Mansfield
2a9bac3c50 Update upstream (#41) 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
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