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.

Sign up for GitHub

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 WorldTime constants #1

Merged
merged 1 commit into from
Nov 1, 2014
Merged

Update WorldTime constants #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/main/java/org/terasology/seasons/Season.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ public enum Season {
FALL("fall", 6),
WINTER("winter", 6);

/**
* Constant that needs to be added to the world time to get the season time.
*/
public static final double WORLD_TIME_OFFSET = -(WorldTime.DAY_LENGTH - WorldTimeImpl.DUSK_TIME) * WorldTimeImpl.MS_TO_DAYS;

/**
* The amount of days of all seasons combined.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/seasons/SeasonSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
@Share(value = SeasonSystem.class)
public class SeasonSystem extends BaseComponentSystem {
private static final Logger logger = LoggerFactory.getLogger(SeasonSystem.class);
private static final float TIME_SHIFT = WorldTimeImpl.MIDDAY_TIME * WorldTimeImpl.MS_TO_DAYS;
private static final float TIME_SHIFT = WorldTime.MIDDAY_TIME * WorldTime.DAY_LENGTH;

@In
private EntityManager entityManager;
Expand Down