Skip to content

still fixing the configurate pr #5438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mdcfe merged 2 commits into from
Jul 22, 2023
Merged

still fixing the configurate pr #5438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6aaf820
Ensure user data deserialization exceptions include file name
JRoy Jul 22, 2023
5a68647
Fix invalid unlimited items preventing userdata to load
JRoy Jul 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Essentials/src/main/java/com/earth2me/essentials/UserData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.spongepowered.configurate.serialize.SerializationException;

import java.io.File;
import java.math.BigDecimal;
Expand Down Expand Up @@ -83,7 +82,7 @@ public final void reloadConfig() {
config.load();
try {
holder = config.getRootNode().get(UserConfigHolder.class);
} catch (SerializationException e) {
} catch (Throwable e) {
Comment thread
mdcfe marked this conversation as resolved.
ess.getLogger().log(Level.SEVERE, "Error while reading user config: " + config.getFile().getName(), e);
throw new RuntimeException(e);
}
Expand Down
4 changes: 3 additions & 1 deletion ...ials/src/main/java/com/earth2me/essentials/config/serializers/MaterialTypeSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ public Material deserialize(Type type, Object obj) throws SerializationException
if (obj instanceof String) {
return Material.matchMaterial((String) obj);
}
return null;

// Configurate will use an EnumSet to deserialize, which doesn't support null types. Default to air.
return Material.AIR;
}

@Override
Expand Down