Skip to content

Fix nurturing - #514

Merged
AngeloTadeucci merged 1 commit into
masterfrom
fix-nurturing
Jun 24, 2025
Merged

Fix nurturing#514
AngeloTadeucci merged 1 commit into
masterfrom
fix-nurturing

Conversation

@AngeloTadeucci

@AngeloTadeucci AngeloTadeucci commented Jun 24, 2025

Copy link
Copy Markdown
Collaborator

Summary by CodeRabbit

  • Bug Fixes
    • Improved reliability of mail transfers between accounts and characters by ensuring database changes are saved at key steps.
    • Corrected nurturing data retrieval for user-generated content maps to use the appropriate object code, enhancing accuracy.
  • Refactor
    • Streamlined the initialization of plot cube interactions, ensuring interactions are set up earlier and more consistently during field loading.
    • Broadened handling of cube interactions in home fields to include all cubes with defined interactions.
  • Documentation
    • Updated method parameter names for clarity in nurturing data retrieval.

@coderabbitai

coderabbitai Bot commented Jun 24, 2025

Copy link
Copy Markdown
Contributor

Walkthrough

The changes update nurturing data handling and furniture interaction logic in both the database and server layers. They adjust how nurturing objects are identified and retrieved, refine the timing and scope of interaction registration for plot cubes, and update mail binding persistence logic. These modifications target improved stability and accuracy for growing furniture features.

Changes

File(s) Change Summary
Maple2.Database/Storage/Game/GameStorage.Mail.cs Added explicit Context.SaveChanges() calls before and after mail reassignment in BindAccountMailsToCharacter.
Maple2.Database/Storage/Game/GameStorage.Map.cs Simplified interact property null checks; switched nurturing property assignment from ItemId to ObjectCode.
Maple2.Database/Storage/Game/GameStorage.Nurturing.cs Renamed method parameter from itemId to interactObjectCode and updated logic to use this new parameter.
Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.cs Moved plot cube interaction registration logic to occur immediately after plot loading instead of after portal spawning.
Maple2.Server.Game/Manager/Field/FieldManager/HomeFieldManager.cs Added logic to register field function interactions for all cubes with an Interact property after portal spawning.

Sequence Diagram(s)

sequenceDiagram
    participant Client
    participant Server
    participant GameStorage
    participant Database

    Client->>Server: Place growing furniture (e.g., Kittywampus's Playground)
    Server->>GameStorage: Request nurturing data (using Interact.ObjectCode)
    GameStorage->>Database: Find nurturing record by characterId and interactObjectCode
    Database-->>GameStorage: Return nurturing record or null
    GameStorage-->>Server: Return nurturing data
    Server->>Server: Register field function interaction for cube (if Interact exists)
    Server-->>Client: Confirm placement and enable interaction
Loading

Assessment against linked issues

Objective (Issue #) Addressed Explanation
Prevent crash when placing growing furniture (e.g., Kittywampus) (#502)
Correct handling of NurturingData for pet furniture (#502)
Ensure stable and accurate registration of furniture interactions (#502)

Assessment against linked issues: Out-of-scope changes

No out-of-scope changes were found.

Possibly related PRs

  • AngeloTadeucci/Maple2#293: Refactored account-wide mail handling, introducing and updating BindAccountMailsToCharacter logic, which is directly refined in this PR.

Suggested reviewers

  • Zintixx

Poem

In fields where Kittywampus leaps and bounds,
A bug once lurked, causing server frowns.
Now nurturing flows by object code's decree,
And furniture grows—crash-free as can be!
With every hop, this rabbit cheers,
For gardens safe from buggy fears. 🐇🌱

✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (1)
Maple2.Database/Storage/Game/GameStorage.Mail.cs (1)

53-53: Verify transaction behavior with explicit SaveChanges() calls.

The addition of explicit Context.SaveChanges() calls within the transaction ensures data persistence at specific points. However, this pattern of multiple SaveChanges() within a single transaction could affect performance and transaction semantics.

Please verify that:

  1. The explicit SaveChanges() calls don't interfere with the transaction rollback capabilities
  2. The performance impact is acceptable for the expected volume of mail binding operations
  3. The intermediate persistence is actually required for correctness

Consider whether the mail removal and re-addition logic could be simplified to a single update operation instead:

#!/bin/bash
# Verify if there are other similar patterns in the codebase
rg -A 5 -B 5 "SaveChanges.*BeginTransaction|BeginTransaction.*SaveChanges" --type cs

Also applies to: 60-60

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 8f6e77c and b0a35b9.

📒 Files selected for processing (5)
  • Maple2.Database/Storage/Game/GameStorage.Mail.cs (1 hunks)
  • Maple2.Database/Storage/Game/GameStorage.Map.cs (1 hunks)
  • Maple2.Database/Storage/Game/GameStorage.Nurturing.cs (1 hunks)
  • Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.cs (1 hunks)
  • Maple2.Server.Game/Manager/Field/FieldManager/HomeFieldManager.cs (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: build
  • GitHub Check: build
  • GitHub Check: format
🔇 Additional comments (4)
Maple2.Database/Storage/Game/GameStorage.Map.cs (1)

237-238: LGTM! Consistent refactor to use interact object codes.

The change correctly shifts from using cube.ItemId to cube.Interact!.ObjectCode for nurturing data retrieval, which aligns with the parameter rename in GameStorage.Nurturing.cs. The null-forgiving operator usage is safe given the condition check.

Maple2.Server.Game/Manager/Field/FieldManager/HomeFieldManager.cs (1)

32-36: LGTM! Improved interaction handling coverage.

The addition of field function interaction registration for all plot cubes with interactions (not just portals) ensures comprehensive interaction setup during home field initialization. This complements the existing portal-specific logic appropriately.

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.cs (1)

142-146: LGTM! Improved initialization timing.

Moving the field function interaction registration to occur immediately after loading plots (rather than after portal spawning) ensures that plot cube interactions are available earlier in the field initialization sequence. This timing improvement makes logical sense.

Maple2.Database/Storage/Game/GameStorage.Nurturing.cs (1)

10-11: LGTM! Consistent parameter rename for clarity.

The parameter rename from itemId to interactObjectCode correctly reflects the actual data being passed and aligns with the corresponding changes in GameStorage.Map.cs where nurturing retrieval now uses interact object codes.

@AngeloTadeucci
AngeloTadeucci merged commit 138fbaf into master Jun 24, 2025
@AngeloTadeucci
AngeloTadeucci deleted the fix-nurturing branch June 24, 2025 01:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Critical Issues with Growing Furniture

2 participants