Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix not using the selected Cash shop surprise

Browse Source 
If you have multiple, it would always use the first one. Now it uses whichever you select (as expected).
This commit is contained in:
P0nk
2024-06-16 15:08:48 +02:00
parent 6ab1af99da
commit 5aeed01e38
4 changed files with 66 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/server/channel/handlers/CashShopSurpriseHandler.java
View File

@@ -42,7 +42,8 @@ public class CashShopSurpriseHandler extends AbstractPacketHandler {
return;
}
Optional<CashShopSurpriseResult> result = cs.openCashShopSurprise();
long cashId = p.readLong();
Optional<CashShopSurpriseResult> result = cs.openCashShopSurprise(cashId);
if (result.isEmpty()) {
c.sendPacket(PacketCreator.onCashItemGachaponOpenFailed());
return;

86
src/main/java/server/CashShop.java
View File

@@ -29,6 +29,7 @@ import client.inventory.Pet;
import config.YamlConfig;
import constants.id.ItemId;
import constants.inventory.ItemConstants;
import net.jcip.annotations.GuardedBy;
import net.server.Server;
import provider.Data;
import provider.DataProvider;
@@ -408,17 +409,6 @@ public class CashShop {
}
}
public int getItemsSize() {
int size = 0;
lock.lock();
try {
size = inventory.size();
} finally {
lock.unlock();
}
return size;
}
public List<Integer> getWishList() {
return wishList;
}
@@ -537,46 +527,58 @@ public class CashShop {
}
}
private Item getCashShopItemByItemid(int itemid) {
public Optional<CashShopSurpriseResult> openCashShopSurprise(long cashId) {
lock.lock();
try {
for (Item it : inventory) {
if (it.getItemId() == itemid) {
return it;
}
Optional<Item> maybeCashShopSurprise = getItemByCashId(cashId);
if (maybeCashShopSurprise.isEmpty() ||
maybeCashShopSurprise.get().getItemId() != ItemId.CASH_SHOP_SURPRISE) {
return Optional.empty();
}
Item cashShopSurprise = maybeCashShopSurprise.get();
if (cashShopSurprise.getQuantity() <= 0) {
return Optional.empty();
}
if (getItemsSize() >= 100) {
return Optional.empty();
}
CashItem cashItemReward = CashItemFactory.getRandomCashItem();
if (cashItemReward == null) {
return Optional.empty();
}
short newQuantity = (short) (cashShopSurprise.getQuantity() - 1);
cashShopSurprise.setQuantity(newQuantity);
if (newQuantity <= 0) {
removeFromInventory(cashShopSurprise);
}
Item itemReward = cashItemReward.toItem();
addToInventory(itemReward);
return Optional.of(new CashShopSurpriseResult(cashShopSurprise, itemReward));
} finally {
lock.unlock();
}
return null;
}
public synchronized Optional<CashShopSurpriseResult> openCashShopSurprise() {
Item cashShopSurprise = getCashShopItemByItemid(ItemId.CASH_SHOP_SURPRISE);
if (cashShopSurprise == null || cashShopSurprise.getQuantity() <= 0) {
return Optional.empty();
@GuardedBy("lock")
private Optional<Item> getItemByCashId(long cashId) {
return inventory.stream()
.filter(item -> item.getCashId() == cashId)
.findAny();
}
public int getItemsSize() {
lock.lock();
try {
return inventory.size();
} finally {
lock.unlock();
}
if (getItemsSize() >= 100) {
return Optional.empty();
}
CashItem cashItemReward = CashItemFactory.getRandomCashItem();
if (cashItemReward == null) {
return Optional.empty();
}
short newQuantity = (short) (cashShopSurprise.getQuantity() - 1);
cashShopSurprise.setQuantity(newQuantity);
if (newQuantity <= 0) {
removeFromInventory(cashShopSurprise);
}
Item itemReward = cashItemReward.toItem();
addToInventory(itemReward);
return Optional.of(new CashShopSurpriseResult(cashShopSurprise, itemReward));
}
public static Item generateCouponItem(int itemId, short quantity) {