Skip to content

Fix fireball entity class #13676

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
Lulu13022002 wants to merge 2 commits into
base: main
Choose a base branch
from
+5 −5
Open

Fix fireball entity class #13676

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
7c8050e
Fix fireball entity class
Lulu13022002 Mar 3, 2026
dcebb45
resolve class only once
Lulu13022002 Mar 5, 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
4 changes: 1 addition & 3 deletions paper-api/src/main/java/org/bukkit/entity/EntityType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
import org.bukkit.entity.minecart.RideableMinecart;
import org.bukkit.entity.minecart.SpawnerMinecart;
import org.bukkit.entity.minecart.StorageMinecart;
import org.bukkit.inventory.ItemStack;
import org.bukkit.potion.PotionEffectType;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -98,7 +96,7 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans
EXPERIENCE_ORB("experience_orb", ExperienceOrb.class, 2),
EYE_OF_ENDER("eye_of_ender", EnderSignal.class, 15),
FALLING_BLOCK("falling_block", FallingBlock.class, 21),
FIREBALL("fireball", Fireball.class, 12),
FIREBALL("fireball", LargeFireball.class, 12),
FIREWORK_ROCKET("firework_rocket", Firework.class, 22),
FISHING_BOBBER("fishing_bobber", FishHook.class, -1, false),
FOX("fox", Fox.class, -1),
Expand Down
5 changes: 3 additions & 2 deletions ...enerator/src/main/java/io/papermc/generator/rewriter/types/simple/EntityTypeRewriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import net.minecraft.util.Util;
import net.minecraft.core.Holder;
import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceKey;
import net.minecraft.util.Util;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.Mob;
Expand All @@ -41,6 +41,7 @@ public class EntityTypeRewriter extends EnumRegistryRewriter<EntityType<?>> {
.put("EndCrystal", "EnderCrystal")
.put("FireworkRocket", "Firework")
.put("FishingBobber", "FishHook")
.put("Fireball", "LargeFireball")
.put("LeashKnot", "LeashHitch")
.put("LightningBolt", "LightningStrike")
.put("Tnt", "TNTPrimed")
Expand Down Expand Up @@ -173,6 +174,6 @@ private String toBukkitClass(Holder.Reference<EntityType<?>> reference) {
.orElseThrow(() -> new IllegalStateException("Could not find entity class for " + reference.key().identifier()))
.resolve(runtime);
Preconditions.checkArgument(org.bukkit.entity.Entity.class.isAssignableFrom(resolvedClass.knownClass()), "Generic type must be an entity");
return this.importCollector.getShortName(this.classNamedView.findFirst(CLASS_RENAMES.getOrDefault(className, className)).resolve(runtime));
return this.importCollector.getShortName(resolvedClass);
}
}
1 change: 1 addition & 0 deletions paper-server/src/test/java/org/bukkit/craftbukkit/entity/EntityTypesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ public <T extends Entity> void testEntityClass(Class<T> clazz) {
public void testEntityType(EntityType entityType) {
CraftEntityTypes.EntityTypeData<?, ?> entityTypeData = CraftEntityTypes.getEntityTypeData(entityType);
assertNotNull(entityTypeData, String.format("Entity type %s does not have an entity type data, please add on to CraftEntityTypes.", entityType));
assertEquals(entityTypeData.entityClass(), entityType.getEntityClass(), String.format("Entity type class for %s does not match CraftEntityTypes.", entityType));
}

@AfterAll
Expand Down
Loading