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

Removed AtomicBoolean's

Browse Source
This commit is contained in:
Tacef Ine
2017-07-17 18:58:25 +02:00
parent f5ef4adc1d
commit 7ee6329326
2 changed files with 4 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/trade/TradeService.java
+4 -15
View File
@@ -11,7 +11,6 @@ import intents.chat.ChatBroadcastIntent;
import intents.network.GalacticPacketIntent;
import network.packets.Packet;
import network.packets.swg.zone.object_controller.SecureTrade;
import network.packets.swg.zone.object_controller.SecureTrade.TradeMessageType;
import network.packets.swg.zone.trade.AbortTradeMessage;
import network.packets.swg.zone.trade.AcceptTransactionMessage;
import network.packets.swg.zone.trade.AddItemMessage;
@@ -72,8 +71,6 @@ public class TradeService extends Service {
if (packet instanceof SecureTrade) {
handleSecureTrade((SecureTrade) packet,gpi.getPlayer(), gpi.getObjectManager());
} else if(packet instanceof BeginTradeMessage){
System.out.println("beginTradetest");
} else if (packet instanceof AbortTradeMessage){
handleAbortTradeMessage(gpi.getPlayer());
} else if (packet instanceof DenyTradeMessage){
@@ -239,23 +236,15 @@ public class TradeService extends Service {
}
private void handleTradeSessionRequest(SecureTrade packet, Player packetSender , CreatureObject initiator, CreatureObject accepter) {
TradeSession tradeSession = packetSender.getCreatureObject().getTradeSession();
SuiMessageBox requestBox = new SuiMessageBox(SuiButtons.OK_CANCEL, "Trade Request", accepter.getOwner().getCharacterName() + " wants to trade with you.\nDo you want to accept the request?");
requestBox.addOkButtonCallback("handleTradeRequest", (player, actor, event, paramenters)-> {
if(initiator.getTradeSession() == null)
return;
if(!tradeSession.isInitiatorBeginSend()){
initiator.sendSelf(new BeginTradeMessage(accepter.getObjectId()));
tradeSession.setInititatorBeginSend(true);
}
if(!tradeSession.isAccepterBeginSend()){
accepter.setTradeSession(initiator.getTradeSession());
accepter.sendSelf(new BeginTradeMessage(initiator.getObjectId()));
tradeSession.setAccepterBeginSend(true);
}
Log.d("Trade Started between Player A: %s and Player B: %s ", initiator.getOwner().getCharacterName(), accepter.getOwner().getCharacterName());
accepter.setTradeSession(initiator.getTradeSession());
initiator.sendSelf(new BeginTradeMessage(accepter.getObjectId()));
accepter.sendSelf(new BeginTradeMessage(initiator.getObjectId()));
Log.d("Trade Started between %s and %s ", initiator.getOwner().getCharacterName(), accepter.getOwner().getCharacterName());
});
requestBox.addCancelButtonCallback("handleTradeRequestDeny", (player, actor, event, paramenters)-> {
if(packetSender.getCreatureObject().equals(initiator)){
src/services/trade/TradeSession.java
-20
View File
@@ -26,8 +26,6 @@ public class TradeSession {
private final AtomicInteger accepterMoneyAmount;
private final AtomicBoolean initiatorVerified;
private final AtomicBoolean accepterVerified;
private final AtomicBoolean initiatorBeginSend;
private final AtomicBoolean accepterBeginSend;
public TradeSession(CreatureObject initiator, CreatureObject accepter) {
this.initiatorTradeItems = new ArrayList<>();
@@ -38,8 +36,6 @@ public class TradeSession {
this.accepterMoneyAmount = new AtomicInteger();
this.initiatorVerified = new AtomicBoolean();
this.accepterVerified = new AtomicBoolean();
this.initiatorBeginSend = new AtomicBoolean();
this.accepterBeginSend = new AtomicBoolean();
}
public void removeFromItemList(CreatureObject requester, long objectId) {
@@ -144,22 +140,6 @@ public class TradeSession {
this.accepterVerified.set(accepterVerified);
}
public boolean isInitiatorBeginSend() {
return initiatorBeginSend.get();
}
public boolean isAccepterBeginSend() {
return accepterBeginSend.get();
}
public void setInititatorBeginSend(boolean inititatorBeginSend){
this.initiatorBeginSend.set(inititatorBeginSend);
}
public void setAccepterBeginSend(boolean accepterBeginSend){
this.accepterBeginSend.set(accepterBeginSend);
}
public void sendAbortTrade() {
Player accepter = this.accepter.getOwner();
Player initiator = this.initiator.getOwner();