This commit is contained in:
Anuken
2019-10-22 18:55:15 -04:00
parent ae4ec55abe
commit b98b9a98e3
12 changed files with 89 additions and 79 deletions
@@ -174,15 +174,15 @@ public class EventType{
}
public static class UnlockEvent{
public final io.anuke.mindustry.ctype.UnlockableContent content;
public final UnlockableContent content;
public UnlockEvent(io.anuke.mindustry.ctype.UnlockableContent content){
public UnlockEvent(UnlockableContent content){
this.content = content;
}
}
public static class ResearchEvent{
public final io.anuke.mindustry.ctype.UnlockableContent content;
public final UnlockableContent content;
public ResearchEvent(UnlockableContent content){
this.content = content;
@@ -132,7 +132,7 @@ public class GlobalData{
}
/** Returns whether or not this piece of content is unlocked yet. */
public boolean isUnlocked(io.anuke.mindustry.ctype.UnlockableContent content){
public boolean isUnlocked(UnlockableContent content){
return content.alwaysUnlocked() || unlocked.getOr(content.getContentType(), ObjectSet::new).contains(content.name);
}