Skip to content

Iss237: fix isInUse() always returning false #238

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

Closed
wants to merge 2 commits into from
Closed

Iss237: fix isInUse() always returning false #238

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8483772
Fix iss237, incubator.isInUse() always returns false unless you ran e…
Jari27 Jul 26, 2016
42ef335
Forgot to remove references to inUse
Jari27 Jul 26, 2016
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
14 changes: 9 additions & 5 deletions src/main/java/com/pokegoapi/api/inventory/EggIncubator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
public class EggIncubator {
private final EggIncubatorOuterClass.EggIncubator proto;
private final PokemonGo pgo;
@Getter
private boolean inUse = false;

/**
* Create new EggIncubator with given proto.
Expand All @@ -43,7 +41,6 @@ public class EggIncubator {
public EggIncubator(PokemonGo pgo, EggIncubatorOuterClass.EggIncubator proto) {
this.pgo = pgo;
this.proto = proto;
this.inUse = proto.getPokemonId() != 0;
}

/**
Expand Down Expand Up @@ -83,8 +80,6 @@ public UseItemEggIncubatorResponse.Result hatchEgg(EggPokemon egg)

pgo.getInventories().updateInventories(true);

this.inUse = true;

return response.getResult();
}

Expand Down Expand Up @@ -123,4 +118,13 @@ public double getKmTarget() {
public double getKmWalked() {
return proto.getStartKmWalked();
}

/**
* Returns whether this incubator is hatching an egg.
*
* @return true if it is currently hatching an egg
*/
public boolean isInUse() {
return getKmTarget() > pgo.getPlayerProfile().getStats().getKmWalked();
}
}