duckietm/Arcturus-Morningstar-Extended
1
0
Fork 0
mirror of https://github.com/duckietm/Arcturus-Morningstar-Extended.git synced 2026-06-20 07:26:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(trading): abort item exchange when persistence fails

Browse Source 
RoomTrade previously caught SQLException during ownership updates but continued into the in-memory inventory and credit transfer path. That could desynchronize or duplicate trade results if the database batch failed while the live session still completed the exchange. Keep item owner mutations after the successful batch, return offered items on failed completion, and add a contract test that prevents SQL failures from falling through to the transfer path.
This commit is contained in:
simoleo89
2026-06-13 02:02:37 +02:00
parent 87e1ef94f7
commit c25cb2a9b6
2 changed files with 65 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTrade.java
+27 -4
View File
@@ -58,7 +58,7 @@ public class RoomTrade {
public synchronized void offerItem(Habbo habbo, HabboItem item) {
RoomTradeUser user = this.getRoomTradeUserForHabbo(habbo);
if (user.getItems().contains(item))
if (user == null || item == null || user.getItems().contains(item))
return;
habbo.getInventory().getItemsComponent().removeHabboItem(item);
@@ -71,6 +71,9 @@ public class RoomTrade {
public synchronized void offerMultipleItems(Habbo habbo, THashSet<HabboItem> items) {
RoomTradeUser user = this.getRoomTradeUserForHabbo(habbo);
if (user == null || items == null)
return;
for (HabboItem item : items) {
if (!user.getItems().contains(item)) {
habbo.getInventory().getItemsComponent().removeHabboItem(item);
@@ -85,7 +88,7 @@ public class RoomTrade {
public synchronized void removeItem(Habbo habbo, HabboItem item) {
RoomTradeUser user = this.getRoomTradeUserForHabbo(habbo);
if (!user.getItems().contains(item))
if (user == null || item == null || !user.getItems().contains(item))
return;
habbo.getInventory().getItemsComponent().addItem(item);
@@ -98,6 +101,9 @@ public class RoomTrade {
public synchronized void accept(Habbo habbo, boolean value) {
RoomTradeUser user = this.getRoomTradeUserForHabbo(habbo);
if (user == null)
return;
user.setAccepted(value);
this.sendMessageToUsers(new TradeAcceptedComposer(user));
@@ -120,6 +126,9 @@ public class RoomTrade {
RoomTradeUser user = this.getRoomTradeUserForHabbo(habbo);
if (user == null)
return;
user.confirm();
this.sendMessageToUsers(new TradeAcceptedComposer(user));
@@ -134,6 +143,12 @@ public class RoomTrade {
if (this.tradeItems()) {
this.closeWindow();
this.sendMessageToUsers(new TradeCompleteComposer());
} else {
this.returnItems();
for (RoomTradeUser roomTradeUser : this.users) {
roomTradeUser.clearItems();
}
this.closeWindow();
}
this.room.stopTrade(this);
@@ -188,7 +203,6 @@ public class RoomTrade {
try (PreparedStatement statement = connection.prepareStatement("UPDATE items SET user_id = ? WHERE id = ? LIMIT 1")) {
try (PreparedStatement stmt = connection.prepareStatement("INSERT INTO room_trade_log_items (id, item_id, user_id) VALUES (?, ?, ?)")) {
for (HabboItem item : userOne.getItems()) {
item.setUserId(userTwoId);
statement.setInt(1, userTwoId);
statement.setInt(2, item.getId());
statement.addBatch();
@@ -202,7 +216,6 @@ public class RoomTrade {
}
for (HabboItem item : userTwo.getItems()) {
item.setUserId(userOneId);
statement.setInt(1, userOneId);
statement.setInt(2, item.getId());
statement.addBatch();
@@ -224,6 +237,16 @@ public class RoomTrade {
}
} catch (SQLException e) {
LOGGER.error("Caught SQL exception", e);
this.sendMessageToUsers(new TradeClosedComposer(userOne.getHabbo().getRoomUnit().getId(), TradeClosedComposer.ITEMS_NOT_FOUND));
return false;
}
for (HabboItem item : userOne.getItems()) {
item.setUserId(userTwo.getHabbo().getHabboInfo().getId());
}
for (HabboItem item : userTwo.getItems()) {
item.setUserId(userOne.getHabbo().getHabboInfo().getId());
}
THashSet<HabboItem> itemsUserOne = new THashSet<>(userOne.getItems());