Fixed checks to include "is target guild same as senders guild"