Fork/Velocitab
2
0
Fork 0
forked from Upstream/Velocitab
Code Pull Requests Actions Releases Activity

Better handling for nullable collision rules

Browse Source
This commit is contained in:
William 2023-03-12 18:14:57 +00:00
parent 6df397b77a
commit da1ead367a
No known key found for this signature in database
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/net/william278/velocitab/packet/UpdateTeamsPacket.java
View File

@ -10,6 +10,7 @@ import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.text.StringEscapeUtils;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -191,19 +192,21 @@ public class UpdateTeamsPacket extends AbstractPacket {
private final String id; private final String id;
NameTagVisibility(String id) { NameTagVisibility(@NotNull String id) {
this.id = id; this.id = id;
} }
@NotNull
public String id() { public String id() {
return id; return id;
} }
public static NameTagVisibility byId(String id) { @NotNull
return Arrays.stream(values()) public static NameTagVisibility byId(@Nullable String id) {
return id == null ? ALWAYS : Arrays.stream(values())
.filter(visibility -> visibility.id.equals(id)) .filter(visibility -> visibility.id.equals(id))
.findFirst() .findFirst()
.orElse(null); .orElse(ALWAYS);
} }
} }
@ -215,19 +218,21 @@ public class UpdateTeamsPacket extends AbstractPacket {
private final String id; private final String id;
CollisionRule(String id) { CollisionRule(@NotNull String id) {
this.id = id; this.id = id;
} }
@NotNull
public String id() { public String id() {
return id; return id;
} }
public static CollisionRule byId(String id) { @NotNull
return Arrays.stream(values()) public static CollisionRule byId(@Nullable String id) {
return id == null ? ALWAYS : Arrays.stream(values())
.filter(rule -> rule.id.equals(id)) .filter(rule -> rule.id.equals(id))
.findFirst() .findFirst()
.orElse(null); .orElse(ALWAYS);
} }
} }
} }