Fix dorm daily gift not giving a vigor soda

This commit is contained in:
Melledy committed 2026-10-21 04:09:26 -07:00
1 parent d62ec2f2a9
commit fbbfb20656
1 file changed
+21 -11
@@ -752,7 +752,6 @@ public class DormManager extends PlayerManager implements GameDatabaseObject {
public synchronized PlayerChangeInfo receiveLayoutRewards(int[] layoutIds) { public synchronized PlayerChangeInfo receiveLayoutRewards(int[] layoutIds) {
// Init variables // Init variables
var change = new PlayerChangeInfo();
var rewards = new ItemParamMap(); var rewards = new ItemParamMap();
boolean received = false; boolean received = false;
@@ -800,20 +799,18 @@ public class DormManager extends PlayerManager implements GameDatabaseObject {
return null; return null;
} }
// Add rewards and trigger quest
this.getPlayer().getInventory().addItems(rewards, change);
this.getPlayer().trigger(QuestCondition.DormRewardReceive, 1);
// Queue a save call for the dorm // Queue a save call for the dorm
this.queueSave = true; this.queueSave = true;
// Success // Add rewards
return change; return this.getPlayer().getInventory().addItems(rewards);
} }
public synchronized PlayerChangeInfo receiveRewards(int[] rewardIds) { public synchronized PlayerChangeInfo receiveRewards(int[] rewardIds) {
var change = new PlayerChangeInfo(); // Init variables
var unlocked = this.getUnlockedRoomIds(); var unlocked = this.getUnlockedRoomIds();
var rewards = new ItemParamMap();
boolean received = false; boolean received = false;
for (int rewardId : rewardIds) { for (int rewardId : rewardIds) {
@@ -826,13 +823,19 @@ public class DormManager extends PlayerManager implements GameDatabaseObject {
continue; continue;
} }
// Get random drop
int itemId = DropPkgDef.getRandomDrop(data.getDropId()); int itemId = DropPkgDef.getRandomDrop(data.getDropId());
if (itemId <= 0) { if (itemId <= 0) {
continue; continue;
} }
this.getPlayer().getInventory().addItem(itemId, 1, change); // Add rewards
rewards.add(itemId, 1);
// Add to received reward ids
this.receivedRewardIds.add(rewardId); this.receivedRewardIds.add(rewardId);
// Set recieved flag
received = true; received = true;
} }
@@ -840,10 +843,17 @@ public class DormManager extends PlayerManager implements GameDatabaseObject {
return null; return null;
} }
this.getPlayer().trigger(QuestCondition.DormDailyReceiveReward, 1); // Add energy soda
rewards.add(81002, 1);
// Queue a save call for the dorm
this.queueSave = true; this.queueSave = true;
return change; // Trigger quest
this.getPlayer().trigger(QuestCondition.DormDailyReceiveReward, 1);
// Add rewards
return this.getPlayer().getInventory().addItems(rewards);
} }
public int getCollectionValue() { public int getCollectionValue() {