Skip to content

Commit 0a3a73c

Browse files
authored
Fix fireball entity class (#13676)
1 parent 02ec8e9 commit 0a3a73c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

paper-api/src/main/java/org/bukkit/entity/EntityType.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
import org.bukkit.entity.minecart.RideableMinecart;
3838
import org.bukkit.entity.minecart.SpawnerMinecart;
3939
import org.bukkit.entity.minecart.StorageMinecart;
40-
import org.bukkit.inventory.ItemStack;
41-
import org.bukkit.potion.PotionEffectType;
4240
import org.jetbrains.annotations.Contract;
4341
import org.jetbrains.annotations.NotNull;
4442
import org.jetbrains.annotations.Nullable;
@@ -98,7 +96,7 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans
9896
EXPERIENCE_ORB("experience_orb", ExperienceOrb.class, 2),
9997
EYE_OF_ENDER("eye_of_ender", EnderSignal.class, 15),
10098
FALLING_BLOCK("falling_block", FallingBlock.class, 21),
101-
FIREBALL("fireball", Fireball.class, 12),
99+
FIREBALL("fireball", LargeFireball.class, 12),
102100
FIREWORK_ROCKET("firework_rocket", Firework.class, 22),
103101
FISHING_BOBBER("fishing_bobber", FishHook.class, -1, false),
104102
FOX("fox", Fox.class, -1),

paper-generator/src/main/java/io/papermc/generator/rewriter/types/simple/EntityTypeRewriter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
import java.util.ArrayList;
1616
import java.util.List;
1717
import java.util.Map;
18-
import net.minecraft.util.Util;
1918
import net.minecraft.core.Holder;
2019
import net.minecraft.core.registries.Registries;
2120
import net.minecraft.resources.ResourceKey;
21+
import net.minecraft.util.Util;
2222
import net.minecraft.world.entity.Entity;
2323
import net.minecraft.world.entity.EntityType;
2424
import net.minecraft.world.entity.Mob;
@@ -41,6 +41,7 @@ public class EntityTypeRewriter extends EnumRegistryRewriter<EntityType<?>> {
4141
.put("EndCrystal", "EnderCrystal")
4242
.put("FireworkRocket", "Firework")
4343
.put("FishingBobber", "FishHook")
44+
.put("Fireball", "LargeFireball")
4445
.put("LeashKnot", "LeashHitch")
4546
.put("LightningBolt", "LightningStrike")
4647
.put("Tnt", "TNTPrimed")

paper-server/src/test/java/org/bukkit/craftbukkit/entity/EntityTypesTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ public <T extends Entity> void testEntityClass(Class<T> clazz) {
185185
public void testEntityType(EntityType entityType) {
186186
CraftEntityTypes.EntityTypeData<?, ?> entityTypeData = CraftEntityTypes.getEntityTypeData(entityType);
187187
assertNotNull(entityTypeData, String.format("Entity type %s does not have an entity type data, please add on to CraftEntityTypes.", entityType));
188+
assertEquals(entityTypeData.entityClass(), entityType.getEntityClass(), String.format("Entity type class for %s does not match CraftEntityTypes.", entityType));
188189
}
189190

190191
@AfterAll

0 commit comments

Comments
 (0)