mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 11:59:25 +00:00
Fix inverted logic in TagEmptyCondition (#10069)
This commit is contained in:
1 parent
419c349a1f
commit
f168ce4499
11 files changed
+247
-18
No files matched your search
@@ -5,19 +5,14 @@
|
||||
|
||||
package net.minecraftforge.common.crafting.conditions;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
import com.mojang.serialization.DynamicOps;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||
|
||||
import net.minecraft.core.HolderGetter;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.tags.TagKey;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.resources.RegistryOps;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
|
||||
public record TagEmptyCondition(TagKey<Item> tag) implements ICondition {
|
||||
public static final MapCodec<TagEmptyCondition> CODEC = RecordCodecBuilder.mapCodec(b -> b.group(
|
||||
@@ -27,14 +22,6 @@ public record TagEmptyCondition(TagKey<Item> tag) implements ICondition {
|
||||
|
||||
@Override
|
||||
public boolean test(ICondition.IContext context, DynamicOps<?> ops) {
|
||||
// Check the actual deserialization context if possible
|
||||
if (ops instanceof RegistryOps<?> reg) {
|
||||
Optional<HolderGetter<Item>> items = reg.getter(Registries.ITEM);
|
||||
if (items.isPresent()) {
|
||||
var optional = items.get().get(this.tag);
|
||||
return optional.isPresent();
|
||||
}
|
||||
}
|
||||
return context.getTag(tag).isEmpty();
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user