mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-15 00:17:52 +02:00
d33cdcf2e6
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: e25c6a75 PR-638: Add CreativeCategory API for Materials CraftBukkit Changes: 86292d3e0 PR-876: Add CreativeCategory API for Materials
33 lines
1.8 KiB
Diff
33 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Tue, 1 Mar 2022 12:45:50 -0800
|
|
Subject: [PATCH] Fix Fluid tags isTagged method
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/tag/CraftFluidTag.java b/src/main/java/org/bukkit/craftbukkit/tag/CraftFluidTag.java
|
|
index f0fa928a66140293166dddc37eee50a2041560ed..eb29131934370ea2865f8feee93ec3cb5490c4b1 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/tag/CraftFluidTag.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/tag/CraftFluidTag.java
|
|
@@ -16,7 +16,7 @@ public class CraftFluidTag extends CraftTag<net.minecraft.world.level.material.F
|
|
|
|
@Override
|
|
public boolean isTagged(Fluid fluid) {
|
|
- return CraftMagicNumbers.getFluid(fluid).is(tag);
|
|
+ return registry.getHolderOrThrow(net.minecraft.resources.ResourceKey.create(net.minecraft.core.Registry.FLUID_REGISTRY, org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(fluid.getKey()))).is(tag); // Paper
|
|
}
|
|
|
|
@Override
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
|
index e504554e606788b66725edb0ce98d3d6246e4fac..d50661d29608e2e805c24a9eb3dd5ce72134a14e 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
|
@@ -201,7 +201,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
|
|
return CraftMagicNumbers.MATERIAL_BLOCK.get(material);
|
|
}
|
|
|
|
- public static net.minecraft.world.level.material.Fluid getFluid(Fluid fluid) {
|
|
+ public static net.minecraft.world.level.material.Fluid getFluid(Material fluid) { // Paper - wrong type
|
|
return CraftMagicNumbers.MATERIAL_FLUID.get(fluid);
|
|
}
|
|
|