8 commits

Author	SHA1	Message	Date
Nassim Jahnke	a07371fed1	Fix custom merchant trade event world reference	2022-07-25 19:21:31 +02:00
Jake Potrebic	88d7a4ed1d	bag o' patches	2022-06-08 00:30:41 -07:00
Nassim Jahnke	1148687a8d	Prepare for 1.19 dev	2022-06-07 18:52:56 +02:00
Jake Potrebic	07deb9ec78	further mitigate possible NPEs	2021-12-04 19:39:52 -08:00
Shane Freeder	55c371884e	Fix trader merchants NPE when interacting with a merchant with non-active trades	2021-12-05 03:00:10 +00:00
Jake Potrebic	66f71cd1e8	updated more patches	2021-11-24 09:37:07 -08:00
Jason Penilla	ed6d43ddb0	Prepare for updating server patches	2021-11-23 00:57:41 -08:00
Jake Potrebic	7df16b7b62	fixes cancelling PlayerTradeEvent (#5612)	2021-09-22 21:10:35 -07:00