Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Update sorted map for base regen case #29

Merged
merged 2 commits into from Jul 13, 2019
Merged

Conversation

e-aakash
Copy link
Member

@e-aakash e-aakash commented Jul 7, 2019

Currently, server crashes with NPE on the second player leaving the game.

@e-aakash e-aakash marked this pull request as ready for review July 7, 2019 06:57
@e-aakash e-aakash added the WIP label Jul 8, 2019
Copy link
Member

@Cervator Cervator left a comment

Choose a reason for hiding this comment

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

Can't provoke the crash with this merged and confirmed good regen in both headless and headed multiplayer. Merging 👍

@@ -122,6 +127,8 @@ private void regenerate(long currentTime) {
RegenComponent regen = entity.getComponent(RegenComponent.class);
HealthComponent health = entity.getComponent(HealthComponent.class);
if (health != null && health.nextRegenTick < currentTime) {
logger.warn("regenerate reached " + entity.getId() + " value " + regen.getRegenValue() + " rate " +
Copy link
Member

Choose a reason for hiding this comment

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

Trivial: Don't need to two-line this, the max line length as per our Checkstyle config is 175, this fits easily (although default IntelliJ is shorter and might have shown this go past it)

@Cervator Cervator merged commit 1aab256 into Terasology:master Jul 13, 2019
@e-aakash e-aakash deleted the correct branch October 5, 2019 18:50
@skaldarnar skaldarnar removed the WIP label May 15, 2021
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.

None yet

3 participants