From c33bbe291bae5325cb53016aebd32d1536f4dac3 Mon Sep 17 00:00:00 2001 From: Waverunner Date: Fri, 28 Mar 2014 21:57:00 -0400 Subject: [PATCH] Combat check before starting trading session --- src/services/trade/TradeService.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/services/trade/TradeService.java b/src/services/trade/TradeService.java index cde8292e..5b22471c 100644 --- a/src/services/trade/TradeService.java +++ b/src/services/trade/TradeService.java @@ -98,10 +98,13 @@ public class TradeService implements INetworkDispatch{ // creates a new trade session for the user who sent the request. It's given the objectID // that the player wants to trade with. - senderClient.getSession().setAttribute("tradeSession", recieverID); - - recieverObject.sendSystemMessage(senderObject.getCustomName() + " wants to trade with you.", (byte) 0); - + if (senderObject.getCombatFlag() == 0 && recieverObject.getCombatFlag() == 0) { + senderClient.getSession().setAttribute("tradeSession", recieverID); + + recieverObject.sendSystemMessage(senderObject.getCustomName() + " wants to trade with you.", (byte) 0); + } else { + senderObject.sendSystemMessage("You can't send a trade request while you or your target is in combat.", (byte) 0); + } } }