Skip to content

Commit

Permalink
fix: insufficient funds message now refreshes in SalepointPurchaseMenu
Browse files Browse the repository at this point in the history
  • Loading branch information
techno-sam committed Aug 8, 2024
1 parent dda32ba commit 439974f
Showing 1 changed file with 14 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.Objects;

public class SalepointPurchaseMenu extends MenuBase<SalepointBlockEntity> {
public static final int CARD_SLOT_INDEX = 0;
public static final int PLAYER_INV_START_INDEX = CARD_SLOT_INDEX + 1;
Expand Down Expand Up @@ -97,6 +99,9 @@ public void setChanged() {

ItemStack card = getItem(0);

Component lastServerSentCardMessage = serverSentCardMessage;
int lastServerSentMaxWithdrawal = serverSentMaxWithdrawal;

serverSentCardMessage = null;
serverSentMaxWithdrawal = -1;

Expand All @@ -111,7 +116,9 @@ public void setChanged() {
}
}

NumismaticsPackets.PACKETS.sendTo(serverPlayer, new SalepointCardPacket(serverSentCardMessage, serverSentMaxWithdrawal, serverSentStateMessage));
if (!Objects.equals(lastServerSentCardMessage, serverSentCardMessage) || lastServerSentMaxWithdrawal != serverSentMaxWithdrawal) {
NumismaticsPackets.PACKETS.sendTo(serverPlayer, new SalepointCardPacket(serverSentCardMessage, serverSentMaxWithdrawal, serverSentStateMessage));
}
}
};
}
Expand Down Expand Up @@ -198,6 +205,10 @@ private void updateStateMessage() {
if (!(player instanceof ServerPlayer serverPlayer))
return;

purchaseCardContainer.setChanged();

Component lastServerSentStateMessage = serverSentStateMessage;

serverSentStateMessage = null;

ISalepointState<?> salepointState = getSalepointState();
Expand All @@ -210,6 +221,7 @@ private void updateStateMessage() {
}
}

NumismaticsPackets.PACKETS.sendTo(serverPlayer, new SalepointCardPacket(serverSentCardMessage, serverSentMaxWithdrawal, serverSentStateMessage));
if (!Objects.equals(lastServerSentStateMessage, serverSentStateMessage))
NumismaticsPackets.PACKETS.sendTo(serverPlayer, new SalepointCardPacket(serverSentCardMessage, serverSentMaxWithdrawal, serverSentStateMessage));
}
}

0 comments on commit 439974f

Please sign in to comment.