projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-30 15:13:10 -04:00
Code Issues Projects Releases Wiki Activity

Combat check before starting trading session

Browse Source
This commit is contained in:
Waverunner
2014-03-28 21:57:00 -04:00
parent 28edaec3ff
commit c33bbe291b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/trade/TradeService.java
+7 -4
View File
@@ -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);
}
}
}