Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-05 00:23:31 +01:00
Code Issues Projects Releases Wiki Activity
356 Commits 4 Branches 1 Tag 4 MiB
7b4d6e99a9
Commit Graph

299 Commits

Author SHA1 Message Date
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
Aaron Hill
bd6cfa1dfc Properly map EntityEffect for 1.9.0/1.9.2 (#92) 2016-09-16 20:59:47 +01:00
Aaron Hill
40e2465947 Fix rare potion race condition with forge 1.8.9 (#73) 2016-09-15 21:43:27 +01:00
Jamie Mansfield
ea1d5fd3a6 Remove duplicate dependency 2016-08-30 22:30:01 +01:00
Jamie Mansfield
a5c3110642 Update pom 
- Update developers list
- Update ci link
 2016-08-30 18:38:26 +01:00
Jamie Mansfield
1d27a880c3 Update upstream 
upstream finnaly caught up on those netty versions :D
 2016-08-30 18:30:38 +01:00
Jamie Mansfield
80bed7979d Remove Event4J patch temporarily 
Its apparently the cause of many issues we are currently having
 2016-08-28 21:23:49 +01:00
Jamie Mansfield
1e10ca1c09 Update upstream 2016-08-26 10:05:00 +01:00
Jamie Mansfield
d6532d31f7 Update upstream 
Hopefully this has worked. I did it rather quickly during the break of American Dad and on mobile data. This is also my first commit from this Ubuntu installation :D
 2016-08-22 22:31:34 +01:00
Jamie Mansfield
21360f278d
Fix modified imports 2016-08-20 21:34:49 +01:00
Jamie Mansfield
12baa16bbf
Update upstream 2016-08-20 21:12:37 +01:00
Jamie Mansfield
d983224c69
Set module author to WaterfallMC 2016-08-17 01:21:26 +01:00
Jamie Mansfield
d1b744857b
Update upstream 2016-08-16 00:47:02 +01:00
Jamie Mansfield
c369fa9f30
Fix the CI links 2016-08-12 19:41:16 +01:00
Techcable
10a81df944
Dump the raw hex of a packet on a decoding error 2016-08-04 19:31:30 -07:00
Techcable
29fc3a8f52
Update upsteram 2016-08-04 19:11:26 -07:00
Troy Frew
5e70cbd859
Upgrade to Netty 4.1.4.Final and remove depracated patch. 
fixes #67
 2016-07-31 14:02:30 -04:00
Troy Frew
2f7ff90ecc
Update upstream 2016-07-31 13:59:30 -04:00
Troy Frew
9f45b24f77 waterfall-chat is under io.github.waterfallmc 2016-07-16 22:38:31 -04:00
Troy Frew
abe3f78e85 Fixed missed change in log/pom.xml 2016-07-16 22:33:11 -04:00
Troy Frew
f04680f98e Update upstream. Fixup patch files for new log module and other changes from upstream. Update netty to 4.1.3.Final 2016-07-16 21:12:39 -04:00
Troy Frew
1056d858fa Reverted Store-last-known-dimension-and-don-t-send-useless-re patch. This patch needs additional work before it is ready for general usage. There are multiple issues with client first connection and client kicks. 2016-07-16 20:45:23 -04:00
Jamie Mansfield
e84b7f2f33
Fix timeout variant patch 2016-07-03 21:53:51 +01:00
Jamie Mansfield
d9420aa63b
Fetch modules from the correct CI 2016-07-03 21:40:10 +01:00
Troy Frew
1cf5557c48 Added more stuff from old Waterfall 2016-07-03 04:07:00 -04:00
Troy Frew
3bf13e6dba Configurable server version in ping patch (#45) 2016-07-01 00:28:19 -05:00
Troy Frew
74d5a3ca34
Fix https://github.com/WaterfallMC/Waterfall/issues/52 2016-07-01 00:05:23 -05:00
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
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
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
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