8 Commits

Author	SHA1	Message	Date
Aikar	05466e3b47	[Auto] Update Upstream ... Upstream has released updates that appear to apply compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing. Bukkit Changes: d2834556 SPIGOT-4219: Event for PigZombies angering. CraftBukkit Changes: a9c796f1 SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations 195f071e SPIGOT-4219: Event for PigZombies angering. 5e3082c7 SPIGOT-4230: Improve legacy block types	2018-08-05 19:46:43 -04:00
Aikar	566740114e	update upstream	2018-07-29 12:42:07 -04:00
Aikar	1b53a468de	Merge branch 'master' into pre/1.13 ... * master: Fix Dupe UUID logic triggering when the duplicate is pending unload	2018-07-28 01:59:20 -04:00
Shane Freeder	f7d02b2518	Update CB/S	2018-07-28 03:38:13 +01:00
Aikar	f51ad46686	Merge branch 'master' into pre/1.13 ... * master: Add some debug for entity slices Mark chunk dirty on entity changes Reduce and improve dupe uuid resolve message Add more entity debug info Bring some 1.13 authors to master Fixed more stuff Remove unsed method Extend player profile API to support skin changes Extend player profile API to support skin changes	2018-07-23 23:20:41 -04:00
Shane Freeder	aad194a32e	Update B/CB/S	2018-07-23 09:44:57 +01:00
Aikar	bf2c56e8ae	Readd configurable max chunk gens per tick	2018-07-21 17:24:18 -04:00
Aikar	1d28f62522	Rebuild patches for upstream merge	2018-07-21 16:43:00 -04:00

Renamed from Spigot-Server-Patches/0338-Duplicate-UUID-Resolve-Option.patch (Browse further)