6 commits

Author	SHA1	Message	Date
Aikar	97d99711ff	Update Upstream	2018-07-21 16:03:10 -04:00
Shane Freeder	7dd591d1a6	update B/CB/S	2018-07-20 20:57:43 +01:00
Shane Freeder	bd34c3623b	NOT FINISHED! She compiles, and she... suffers the wrath of chunkgen...	2018-07-19 05:42:43 +01:00
Shane Freeder	20e3b69061	NOT FINISHED! 1.13 pre-7 ... I need more creative commit messages.	2018-07-19 00:16:19 +01:00
Aikar	0a953a924a	Fix issues with getBlockState(false) not loading Tile Entity data ... This only impacted people who used our useSnapshots new API in a plugin, which obviously was no one as the data result was completely broken. Merged the NPE check patch into mine since it has to handle it too.	2018-06-30 01:40:52 -04:00
BillyGalbreath	4a55e34625	Make shield blocking delay configurable (#1154) ... Resolves #1153	2018-06-16 14:54:35 -05:00