CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix old potion exchanges

Browse Source
This commit is contained in:
okx-code
2024-08-21 16:00:28 +01:00
parent 7de5891854
commit a5fbdfba8c
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/itemexchange-paper/src/main/java/com/untamedears/itemexchange/rules/modifiers/PotionModifier.java
View File

@@ -84,7 +84,11 @@ public final class PotionModifier extends ModifierData {
@Nonnull
public static PotionModifier fromNBT(@Nonnull final NBTCompound nbt) {
final var modifier = new PotionModifier();
modifier.setPotionData(NBTEncodings.decodePotionData(nbt.getCompound(BASE_KEY)));
PotionType type = NBTEncodings.decodePotionData(nbt.getCompound(BASE_KEY));
if (type == null) {
return null; // "UNCRAFTABLE" potion which is removed in 1.21
}
modifier.setPotionData(type);
modifier.setEffects(Arrays.stream(nbt.getCompoundArray(EFFECTS_KEY))
.map(NBTEncodings::decodePotionEffect)
.collect(Collectors.toCollection(ArrayList::new)));

6
plugins/itemexchange-paper/src/main/java/com/untamedears/itemexchange/utility/NBTEncodings.java
View File

@@ -71,7 +71,11 @@ public final class NBTEncodings {
if (nbt == null) {
return null;
}
return PotionType.valueOf(nbt.getString(TYPE_KEY));
String type = nbt.getString(TYPE_KEY);
if ("UNCRAFTABLE".equals(type)) {
return null;
}
return PotionType.valueOf(type);
}
// ------------------------------------------------------------