Handle less than 1 regen and removing Regen logic #10
Conversation
e-aakash
changed the title
| invokeRegenOperations(currentTime); | ||
| if (currentTime > lastTick + CHECK_INTERVAL) { | ||
| invokeRegenOperations(currentTime); | ||
| lastTick = currentTime; |
There was a problem hiding this comment.
very minor point but to reduce the work done every frame you should do the addition of CHECK_INTERVAL here and not in the if condition
| entity.removeComponent(RegenComponent.class); | ||
| entity.send(new OnFullyHealedEvent(entity)); | ||
| } | ||
| entity.saveComponent(health); | ||
| } | ||
| } | ||
| for (Long endTime : regenToBeRemoved) { |
There was a problem hiding this comment.
If you feel like being fancy you can use a lambda here.
Not suggesting that you do do this, leaving it as a loop is clear. But just giving you more info.
| public void onRegenRemoved(DeactivateRegenEvent event, EntityRef entity, HealthComponent health, | ||
| RegenComponent regen) { | ||
| regenSortedByTime.remove(regen.getLowestEndTime(), entity); | ||
| if (event.id.equals("all")) { |
There was a problem hiding this comment.
Can we get these strings ("all" and "baseRegen") as public static fields.
| for (float value: regenValue.values()) { | ||
| totalValue += value; | ||
| } | ||
| if (totalValue < 0) { | ||
| totalValue = 0; | ||
| remainder = Math.min(1, remainder); |
There was a problem hiding this comment.
You can actually do
remainder = totalValue % 1 //modulo 1To get the remainder when dividing by 1.
This saves you having to floor to int and then subtract to get the return value
src/main/java/org/terasology/logic/health/event/DeactivateRegenEvent.java
Show resolved
Hide resolved
| RegenComponent regen = entity.getComponent(RegenComponent.class); | ||
| HealthComponent health = entity.getComponent(HealthComponent.class); | ||
| if (health.nextRegenTick < currentTime) { | ||
| if (health != null && health.nextRegenTick < currentTime) { |
There was a problem hiding this comment.
Added null check because NPE is thrown when blocks are destroyed.
| @@ -33,6 +33,7 @@ | |||
| import org.terasology.logic.health.event.OnFullyHealedEvent; | |||
| import org.terasology.protobuf.EntityData; | |||
| import org.terasology.registry.In; | |||
| import org.terasology.world.generation.BaseFacetedWorldGenerator; | |||
|
Tested out and merged :-) I added a tiny commit to remove a few unused bits. |
Solves #9
How to test:
How to test multiplayer