zhdev/griefus
1
0
Fork 0
Code Issues Pull requests Activity

Hide item deserialization errors unless using development branch (fixes #550)

Browse source
This commit is contained in:
Intelli 2024-06-17 18:49:43 -06:00
parent 957bf70c26
commit aaa7a3536a
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/net/coreprotect/database/statement/EntityStatement.java
View file

@ -65,7 +65,7 @@ public class EntityStatement {
resultSet.close(); resultSet.close();
} }
catch (Exception e) { // only display this exception on development branch catch (Exception e) { // only display exception on development branch
if (!ConfigHandler.EDITION_BRANCH.contains("-dev")) { if (!ConfigHandler.EDITION_BRANCH.contains("-dev")) {
e.printStackTrace(); e.printStackTrace();
} }

11
src/main/java/net/coreprotect/utility/Util.java
View file

@ -586,10 +586,19 @@ public class Util extends Queue {
return result; return result;
} }
public static ItemMeta deserializeItemMeta(Class<? extends ItemMeta> itemMetaClass, Map<String, Object> args) { public static ItemMeta deserializeItemMetax(Class<? extends ItemMeta> itemMetaClass, Map<String, Object> args) {
try {
DelegateDeserialization delegate = itemMetaClass.getAnnotation(DelegateDeserialization.class); DelegateDeserialization delegate = itemMetaClass.getAnnotation(DelegateDeserialization.class);
return (ItemMeta) ConfigurationSerialization.deserializeObject(args, delegate.value()); return (ItemMeta) ConfigurationSerialization.deserializeObject(args, delegate.value());
} }
catch (Exception e) { // only display exception on development branch
if (!ConfigHandler.EDITION_BRANCH.contains("-dev")) {
e.printStackTrace();
}
}
return null;
}
public static <K, V extends Comparable<? super V>> SortedSet<Map.Entry<K, V>> entriesSortedByValues(Map<K, V> map) { public static <K, V extends Comparable<? super V>> SortedSet<Map.Entry<K, V>> entriesSortedByValues(Map<K, V> map) {
SortedSet<Map.Entry<K, V>> sortedEntries = new TreeSet<>((e1, e2) -> { SortedSet<Map.Entry<K, V>> sortedEntries = new TreeSet<>((e1, e2) -> {