4 commits

Author	SHA1	Message	Date
Aikar	566740114e	update upstream	2018-07-29 12:42:07 -04:00
Aikar	230b8d4258	Merge pull request #1256 ... bfbd24c5 Fix decompile error (Hugo Manrique) 1f5d23d9 Re-add Vanished players don't have rights patch (Hugo Manrique) * pull/1256/head: Fix decompile error Re-add Vanished players don't have rights patch	2018-07-25 19:41:35 -04:00
Aikar	c280d84172	Update upstream and remove hopper patch for #1270	2018-07-25 01:11:08 -04:00
Aikar	3ad50727b9	Merge pull request #1254 ... 0fbf3e77 Re-add Option to prevent armor stands from doing entity lookups (Hugo Manrique) * pull/1254/head: Re-add Option to prevent armor stands from doing entity lookups	2018-07-23 20:22:51 -04:00