GeyserMC-Mirror/Floodgate
1
0
Fork 0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-30 12:19:22 +00:00
Code Issues Releases Activity

Added skins for Velocity and added a few checks before requesting skins

Browse Source
This commit is contained in:
Tim203
2020-12-23 11:41:35 +01:00
parent 36d9a9c27f
commit 7c4dc9d178
10 changed files with 253 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/main/java/org/geysermc/floodgate/api/player/FloodgatePlayer.java
View File

@@ -120,6 +120,10 @@ public interface FloodgatePlayer {
return sendForm(formBuilder.build());
}
boolean hasProperty(PropertyKey key);
boolean hasProperty(String key);
<T> T getProperty(PropertyKey key);
<T> T getProperty(String key);

32
api/src/main/java/org/geysermc/floodgate/api/player/PropertyKey.java
View File

@@ -43,12 +43,12 @@ public class PropertyKey {
private final String key;
private final boolean changeable;
private final boolean removeable;
private final boolean removable;
public PropertyKey(String key, boolean changeable, boolean removeable) {
public PropertyKey(String key, boolean changeable, boolean removable) {
this.key = key;
this.changeable = changeable;
this.removeable = removeable;
this.removable = removable;
}
@Override
@@ -63,32 +63,36 @@ public class PropertyKey {
return false;
}
public AllowedResult isAddAllowed(Object obj) {
public Result isAddAllowed(Object obj) { //todo use for add and remove
if (obj instanceof PropertyKey) {
PropertyKey propertyKey = (PropertyKey) obj;
if (key.equals(propertyKey.key)) {
if ((propertyKey.changeable == changeable || propertyKey.changeable) &&
(propertyKey.removeable == removeable || propertyKey.removeable)) {
return AllowedResult.CORRECT;
(propertyKey.removable == removable || propertyKey.removable)) {
return Result.ALLOWED;
}
return AllowedResult.INVALID_TAGS;
return Result.INVALID_TAGS;
}
return AllowedResult.NOT_EQUALS;
return Result.NOT_EQUALS;
}
if (obj instanceof String) {
if (changeable) {
return AllowedResult.CORRECT;
if (key.equals(obj)) {
if (changeable) {
return Result.ALLOWED;
}
return Result.NOT_ALLOWED;
}
return AllowedResult.INVALID_TAGS;
return Result.INVALID_TAGS;
}
return AllowedResult.NOT_EQUALS;
return Result.NOT_EQUALS;
}
public enum AllowedResult {
public enum Result {
NOT_EQUALS,
INVALID_TAGS,
CORRECT
NOT_ALLOWED,
ALLOWED
}
}