2 commits

Author	SHA1	Message	Date
Jake Potrebic	72a3175165	Updated Upstream (Bukkit/CraftBukkit) (#6791)	2021-10-17 17:57:00 +01:00
Jake Potrebic	0a16fb8182	Fix merchant inventories not closing on entity removal (#6544)	2021-10-15 20:19:08 -07:00