EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-24 22:26:46 +01:00
Code Issues Projects Releases Wiki Activity

forced promotion on a random player in a party if party leader is ever null

Browse Source
This commit is contained in:
nossr50 2020-12-08 14:31:54 -08:00
parent 29fffbcc2a
commit 17268ca4ad
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/gmail/nossr50/datatypes/party/PersistentPartyData.java
View File

@ -5,6 +5,7 @@ import com.gmail.nossr50.datatypes.dirtydata.DirtySet;
import com.gmail.nossr50.datatypes.mutableprimitives.MutableBoolean; import com.gmail.nossr50.datatypes.mutableprimitives.MutableBoolean;
import com.gmail.nossr50.datatypes.mutableprimitives.MutableString; import com.gmail.nossr50.datatypes.mutableprimitives.MutableString;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.HashSet; import java.util.HashSet;
import java.util.Objects; import java.util.Objects;
@ -15,13 +16,14 @@ public class PersistentPartyData {
private final @NotNull MutableBoolean dirtyFlag; //Dirty values in this class will change this flag as needed private final @NotNull MutableBoolean dirtyFlag; //Dirty values in this class will change this flag as needed
private final @NotNull DirtyData<MutableString> partyName; private final @NotNull DirtyData<MutableString> partyName;
private final @NotNull DirtySet<PartyMember> partyMembers; //TODO: Add cache for subsets private final @NotNull DirtySet<PartyMember> partyMembers; //TODO: Add cache for subsets
private @NotNull PartyMember partyLeaderRef; private @Nullable PartyMember partyLeaderRef;
public PersistentPartyData(@NotNull String partyName, public PersistentPartyData(@NotNull String partyName,
@NotNull Set<PartyMember> partyMembers) { @NotNull Set<PartyMember> partyMembers) throws RuntimeException {
dirtyFlag = new MutableBoolean(false); dirtyFlag = new MutableBoolean(false);
this.partyName = new DirtyData<>(new MutableString(partyName), dirtyFlag); this.partyName = new DirtyData<>(new MutableString(partyName), dirtyFlag);
this.partyMembers = new DirtySet<>(new HashSet<>(partyMembers), dirtyFlag); this.partyMembers = new DirtySet<>(new HashSet<>(partyMembers), dirtyFlag);
initPartyLeaderRef(); initPartyLeaderRef();
} }
@ -32,13 +34,20 @@ public class PersistentPartyData {
break; break;
} }
} }
//TODO: Make it impossible for the party leader to be null
if(partyLeaderRef == null)
throw new RuntimeException("Party leader is null!");
} }
/**
* Retrieves a party leader, if one doesn't exist a "random" player is forcibly promoted to leader
* Random being the first player in the set
*
* @see #partyMembers
* @return the party leader
*/
public @NotNull PartyMember getPartyLeader() { public @NotNull PartyMember getPartyLeader() {
if(partyLeaderRef == null) {
//The first player in a party is now the leader
partyLeaderRef = (PartyMember) getPartyMembers().unwrapSet().toArray()[0];
}
return partyLeaderRef; return partyLeaderRef;
} }
@ -47,7 +56,7 @@ public class PersistentPartyData {
return partyName.getData().getImmutableCopy(); return partyName.getData().getImmutableCopy();
} }
public @NotNull Set<PartyMember> getPartyMembers() { public @NotNull DirtySet<PartyMember> getPartyMembers() {
return partyMembers; return partyMembers;
} }