4 commits

Author	SHA1	Message	Date
Zach Brown	a088a9fa51	Update patches that slipped through last	2018-01-05 01:30:03 -06:00
Zach Brown	1c208bf05b	Update upstream CB/S	2017-06-18 20:36:55 -05:00
Zach Brown	013c024ca2	Update upstream CB	2017-01-28 17:36:03 -06:00
Aikar	59b9ad36e6	Remove FishingHook reference on Craft Entity removal ... This caused some bugs chickeneer reported to me, with fishing.	2016-09-21 23:45:05 -04:00