Skip to content

Fix data component conversion in CraftEntity throwing a ClassCastException #14099

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

Open
TheZexquex wants to merge 2 commits into
base: main
Choose a base branch
from
+10 −6
Open

Fix data component conversion in CraftEntity throwing a ClassCastException #14099

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
ae28fd9
Fix data component conversion in CraftEntity throwing a ClassCastExce…
TheZexquex Jul 24, 2026
c50e3b1
Remove unnecessary fqn in getData and convertDataComponentValue
TheZexquex Jul 24, 2026
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
5 changes: 3 additions & 2 deletions paper-server/src/main/java/io/papermc/paper/datacomponent/PaperDataComponentType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.util.HashSet;
import java.util.Set;
import net.minecraft.core.Holder;
import net.minecraft.core.component.DataComponentGetter;
import net.minecraft.core.component.DataComponentMap;
import net.minecraft.core.registries.Registries;
import org.bukkit.craftbukkit.CraftRegistry;
Expand Down Expand Up @@ -32,9 +33,9 @@ public static Set<DataComponentType> minecraftToBukkit(final Set<net.minecraft.c
return Collections.unmodifiableSet(types);
}

public static <B, M> @Nullable B convertDataComponentValue(final DataComponentMap map, final PaperDataComponentType.ValuedImpl<B, M> type) {
public static <B, M> @Nullable B convertDataComponentValue(final DataComponentGetter getter, final PaperDataComponentType.ValuedImpl<B, M> type) {
final net.minecraft.core.component.DataComponentType<M> nms = bukkitToMinecraft(type);
final M nmsValue = map.get(nms);
final M nmsValue = getter.get(nms);
if (nmsValue == null) {
return null;
}
Expand Down
9 changes: 6 additions & 3 deletions paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.google.common.collect.Lists;
import com.mojang.logging.LogUtils;
import io.papermc.paper.datacomponent.DataComponentType;
import io.papermc.paper.datacomponent.PaperDataComponentType;
import io.papermc.paper.entity.LookAnchor;
import io.papermc.paper.entity.TeleportFlag;
import java.util.EnumSet;
Expand Down Expand Up @@ -1324,19 +1325,21 @@ public void broadcastHurtAnimation(java.util.Collection<Player> players) {
((CraftPlayer) player).sendHurtAnimation(0, this);
}
}

@Override
public <T> @Nullable T getData(@NotNull final DataComponentType.Valued<T> type) {
return this.entity.get(io.papermc.paper.datacomponent.PaperDataComponentType.bukkitToMinecraft(type));
return PaperDataComponentType.convertDataComponentValue(this.getHandle(), (PaperDataComponentType.ValuedImpl<T, ?>) type);
}

@Override
public <T> @Nullable T getDataOrDefault(@NotNull final DataComponentType.Valued<? extends T> type, @Nullable final T fallback) {
return this.entity.getOrDefault(io.papermc.paper.datacomponent.PaperDataComponentType.bukkitToMinecraft(type), fallback);
final T value = this.getData((DataComponentType.Valued<T>) type);
return (value != null) ? value : fallback;
}

@Override
public boolean hasData(final @NotNull DataComponentType type) {
return this.entity.get(io.papermc.paper.datacomponent.PaperDataComponentType.bukkitToMinecraft(type)) != null;
return this.getHandle().get(io.papermc.paper.datacomponent.PaperDataComponentType.bukkitToMinecraft(type)) != null;
}

}
2 changes: 1 addition & 1 deletion paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ public <T> T getData(final io.papermc.paper.datacomponent.DataComponentType.Valu
if (this.isEmpty()) {
return null;
}
return PaperDataComponentType.convertDataComponentValue(this.handle.getComponents(), (PaperDataComponentType.ValuedImpl<T, ?>) type);
return PaperDataComponentType.convertDataComponentValue(this.handle, (PaperDataComponentType.ValuedImpl<T, ?>) type);
}

@Override
Expand Down
Loading