Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

move soundsource, prob fixes 10644 #10645

Merged
merged 5 commits into from
Feb 9, 2025
Merged

move soundsource, prob fixes 10644 #10645

merged 5 commits into from
Feb 9, 2025

Conversation

Raycoms
Copy link
Contributor

@Raycoms Raycoms commented Feb 8, 2025

Closes #10644
Closes #10646

Changes proposed in this pull request

  • Move soundsource of raid source to hostile
  • Fix concrete mixer issue
  • Remove extra food handout
  • Fix standup/sitdown loop at restaurant

Testing

  • Yes I tested this before submitting it.
  • I also did a multiplayer test.

Review please

@@ -292,7 +291,7 @@ private EatingState goToEatingPlace()
}
}

if (EntityNavigationUtils.walkToPos(citizen, eatPos, 2, true))
if (citizen.getVehicle() != null || EntityNavigationUtils.walkToPos(citizen, eatPos, 2, true))
Copy link
Contributor

Choose a reason for hiding this comment

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

this shouldnt be needed, if it is then another logic is failing, an it creates a new sitting entity for the citizen that is sitting already

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The citizen end up in a sit/stand loop because walkToPos resets the sitting position

@Raycoms Raycoms merged commit 4133895 into version/1.21 Feb 9, 2025
5 checks passed
@Raycoms Raycoms deleted the solve/10644 branch February 9, 2025 13:40
Raycoms added a commit that referenced this pull request Feb 9, 2025
Move soundsource of raid source to hostile
Fix concrete mixer issue
Remove extra food handout
Fix standup/sitdown loop at restaurant
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants