Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-19 01:59:13 +01:00
Code Issues Projects Releases Wiki Activity

#1235: Move EntityType return to base Entity class

Browse Source 
By: DerFrZocker <derrieple@gmail.com>
This commit is contained in:
CraftBukkit/Spigot 2023-08-13 07:52:40 +10:00
parent cc7d27cb4a
commit 5d0b3018de
132 changed files with 12 additions and 785 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAllay.java
View File

@ -8,7 +8,6 @@ import org.bukkit.Material;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftInventory;
import org.bukkit.craftbukkit.util.CraftLocation;
import org.bukkit.entity.EntityType;
import org.bukkit.inventory.Inventory;
public class CraftAllay extends CraftCreature implements org.bukkit.entity.Allay {
@ -27,11 +26,6 @@ public class CraftAllay extends CraftCreature implements org.bukkit.entity.Allay
return "CraftAllay";
}
@Override
public EntityType getType() {
return EntityType.ALLAY;
}
@Override
public Inventory getInventory() {
return new CraftInventory(getHandle().getInventory());

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAmbient.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.ambient.EntityAmbient;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Ambient;
import org.bukkit.entity.EntityType;
public class CraftAmbient extends CraftMob implements Ambient {
public CraftAmbient(CraftServer server, EntityAmbient entity) {
@ -19,9 +18,4 @@ public class CraftAmbient extends CraftMob implements Ambient {
public String toString() {
return "CraftAmbient";
}
@Override
public EntityType getType() {
return EntityType.UNKNOWN;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java
View File

@ -15,7 +15,6 @@ import org.bukkit.craftbukkit.CraftParticle;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.potion.CraftPotionUtil;
import org.bukkit.entity.AreaEffectCloud;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.potion.PotionData;
import org.bukkit.potion.PotionEffect;
@ -38,11 +37,6 @@ public class CraftAreaEffectCloud extends CraftEntity implements AreaEffectCloud
return "CraftAreaEffectCloud";
}
@Override
public EntityType getType() {
return EntityType.AREA_EFFECT_CLOUD;
}
@Override
public int getDuration() {
return getHandle().getDuration();

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
View File

@ -6,7 +6,6 @@ import org.bukkit.craftbukkit.CraftEquipmentSlot;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.ArmorStand.LockType;
import org.bukkit.entity.EntityType;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.ItemStack;
import org.bukkit.util.EulerAngle;
@ -22,11 +21,6 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
return "CraftArmorStand";
}
@Override
public EntityType getType() {
return EntityType.ARMOR_STAND;
}
@Override
public EntityArmorStand getHandle() {
return (EntityArmorStand) super.getHandle();

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
View File

@ -7,7 +7,6 @@ import org.bukkit.block.Block;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.AbstractArrow;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.projectiles.ProjectileSource;
public class CraftArrow extends AbstractProjectile implements AbstractArrow {
@ -128,9 +127,4 @@ public class CraftArrow extends AbstractProjectile implements AbstractArrow {
public String toString() {
return "CraftArrow";
}
@Override
public EntityType getType() {
return EntityType.UNKNOWN;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import com.google.common.base.Preconditions;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Axolotl;
import org.bukkit.entity.EntityType;
public class CraftAxolotl extends CraftAnimals implements Axolotl {
@ -16,11 +15,6 @@ public class CraftAxolotl extends CraftAnimals implements Axolotl {
return (net.minecraft.world.entity.animal.axolotl.Axolotl) super.getHandle();
}
@Override
public EntityType getType() {
return EntityType.AXOLOTL;
}
@Override
public String toString() {
return "CraftAxolotl";

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBat.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.ambient.EntityBat;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Bat;
import org.bukkit.entity.EntityType;
public class CraftBat extends CraftAmbient implements Bat {
public CraftBat(CraftServer server, EntityBat entity) {
@ -20,11 +19,6 @@ public class CraftBat extends CraftAmbient implements Bat {
return "CraftBat";
}
@Override
public EntityType getType() {
return EntityType.BAT;
}
@Override
public boolean isAwake() {
return !getHandle().isResting();

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBee.java
View File

@ -7,7 +7,6 @@ import org.bukkit.Location;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.util.CraftLocation;
import org.bukkit.entity.Bee;
import org.bukkit.entity.EntityType;
public class CraftBee extends CraftAnimals implements Bee {
@ -25,11 +24,6 @@ public class CraftBee extends CraftAnimals implements Bee {
return "CraftBee";
}
@Override
public EntityType getType() {
return EntityType.BEE;
}
@Override
public Location getHive() {
BlockPosition hive = getHandle().getHivePos();

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBlaze.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityBlaze;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Blaze;
import org.bukkit.entity.EntityType;
public class CraftBlaze extends CraftMonster implements Blaze {
public CraftBlaze(CraftServer server, EntityBlaze entity) {
@ -19,9 +18,4 @@ public class CraftBlaze extends CraftMonster implements Blaze {
public String toString() {
return "CraftBlaze";
}
@Override
public EntityType getType() {
return EntityType.BLAZE;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBlockDisplay.java
View File

@ -5,7 +5,6 @@ import org.bukkit.block.data.BlockData;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.block.data.CraftBlockData;
import org.bukkit.entity.BlockDisplay;
import org.bukkit.entity.EntityType;
public class CraftBlockDisplay extends CraftDisplay implements BlockDisplay {
@ -23,11 +22,6 @@ public class CraftBlockDisplay extends CraftDisplay implements BlockDisplay {
return "CraftBlockDisplay";
}
@Override
public EntityType getType() {
return EntityType.BLOCK_DISPLAY;
}
@Override
public BlockData getBlock() {
return CraftBlockData.fromData(getHandle().getBlockState());

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
View File

@ -7,7 +7,6 @@ import org.bukkit.TreeSpecies;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Boat;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
public class CraftBoat extends CraftVehicle implements Boat {
@ -96,11 +95,6 @@ public class CraftBoat extends CraftVehicle implements Boat {
return "CraftBoat{boatType=" + getBoatType() + ",status=" + getStatus() + ",passengers=" + getPassengers().stream().map(Entity::toString).collect(Collectors.joining("-", "{", "}")) + "}";
}
@Override
public EntityType getType() {
return EntityType.BOAT;
}
public static Boat.Type boatTypeFromNms(EntityBoat.EnumBoatType boatType) {
return switch (boatType) {
default -> throw new EnumConstantNotPresentException(Type.class, boatType.name());

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCamel.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.EntityPose;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Camel;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Horse;
public class CraftCamel extends CraftAbstractHorse implements Camel {
@ -22,11 +21,6 @@ public class CraftCamel extends CraftAbstractHorse implements Camel {
return "CraftCamel";
}
@Override
public EntityType getType() {
return EntityType.CAMEL;
}
@Override
public Horse.Variant getVariant() {
return Horse.Variant.CAMEL;

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java
View File

@ -8,7 +8,6 @@ import org.bukkit.DyeColor;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Cat;
import org.bukkit.entity.Cat.Type;
import org.bukkit.entity.EntityType;
public class CraftCat extends CraftTameableAnimal implements Cat {
@ -21,11 +20,6 @@ public class CraftCat extends CraftTameableAnimal implements Cat {
return (EntityCat) super.getHandle();
}
@Override
public EntityType getType() {
return EntityType.CAT;
}
@Override
public String toString() {
return "CraftCat";

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCaveSpider.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityCaveSpider;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.CaveSpider;
import org.bukkit.entity.EntityType;
public class CraftCaveSpider extends CraftSpider implements CaveSpider {
public CraftCaveSpider(CraftServer server, EntityCaveSpider entity) {
@ -19,9 +18,4 @@ public class CraftCaveSpider extends CraftSpider implements CaveSpider {
public String toString() {
return "CraftCaveSpider";
}
@Override
public EntityType getType() {
return EntityType.CAVE_SPIDER;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftChestBoat.java
View File

@ -7,7 +7,6 @@ import org.bukkit.NamespacedKey;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftInventory;
import org.bukkit.craftbukkit.util.CraftNamespacedKey;
import org.bukkit.entity.EntityType;
import org.bukkit.inventory.Inventory;
import org.bukkit.loot.LootTable;
@ -30,11 +29,6 @@ public class CraftChestBoat extends CraftBoat implements org.bukkit.entity.Chest
return "CraftChestBoat";
}
@Override
public EntityType getType() {
return EntityType.CHEST_BOAT;
}
@Override
public Inventory getInventory() {
return inventory;

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.EntityChicken;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Chicken;
import org.bukkit.entity.EntityType;
public class CraftChicken extends CraftAnimals implements Chicken {
@ -20,9 +19,4 @@ public class CraftChicken extends CraftAnimals implements Chicken {
public String toString() {
return "CraftChicken";
}
@Override
public EntityType getType() {
return EntityType.CHICKEN;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCod.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.EntityCod;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Cod;
import org.bukkit.entity.EntityType;
public class CraftCod extends CraftFish implements Cod {
@ -20,9 +19,4 @@ public class CraftCod extends CraftFish implements Cod {
public String toString() {
return "CraftCod";
}
@Override
public EntityType getType() {
return EntityType.COD;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexPart.java
View File

@ -5,7 +5,6 @@ import net.minecraft.world.entity.boss.enderdragon.EntityEnderDragon;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.ComplexEntityPart;
import org.bukkit.entity.ComplexLivingEntity;
import org.bukkit.entity.EntityType;
import org.bukkit.event.entity.EntityDamageEvent;
public class CraftComplexPart extends CraftEntity implements ComplexEntityPart {
@ -42,9 +41,4 @@ public class CraftComplexPart extends CraftEntity implements ComplexEntityPart {
public String toString() {
return "CraftComplexPart";
}
@Override
public EntityType getType() {
return EntityType.UNKNOWN;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCow.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.EntityCow;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Cow;
import org.bukkit.entity.EntityType;
public class CraftCow extends CraftAnimals implements Cow {
@ -20,9 +19,4 @@ public class CraftCow extends CraftAnimals implements Cow {
public String toString() {
return "CraftCow";
}
@Override
public EntityType getType() {
return EntityType.COW;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
View File

@ -4,7 +4,6 @@ import com.google.common.base.Preconditions;
import net.minecraft.world.entity.monster.EntityCreeper;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Creeper;
import org.bukkit.entity.EntityType;
import org.bukkit.event.entity.CreeperPowerEvent;
public class CraftCreeper extends CraftMonster implements Creeper {
@ -90,9 +89,4 @@ public class CraftCreeper extends CraftMonster implements Creeper {
public String toString() {
return "CraftCreeper";
}
@Override
public EntityType getType() {
return EntityType.CREEPER;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDisplay.java
View File

@ -4,7 +4,6 @@ import com.google.common.base.Preconditions;
import org.bukkit.Color;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Display;
import org.bukkit.entity.EntityType;
import org.bukkit.util.Transformation;
public class CraftDisplay extends CraftEntity implements Display {
@ -23,11 +22,6 @@ public class CraftDisplay extends CraftEntity implements Display {
return "CraftDisplay";
}
@Override
public EntityType getType() {
return EntityType.UNKNOWN;
}
@Override
public Transformation getTransformation() {
com.mojang.math.Transformation nms = net.minecraft.world.entity.Display.createTransformation(getHandle().getEntityData());

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDolphin.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.EntityDolphin;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Dolphin;
import org.bukkit.entity.EntityType;
public class CraftDolphin extends CraftWaterMob implements Dolphin {
@ -20,9 +19,4 @@ public class CraftDolphin extends CraftWaterMob implements Dolphin {
public String toString() {
return "CraftDolphin";
}
@Override
public EntityType getType() {
return EntityType.DOLPHIN;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDonkey.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.horse.EntityHorseDonkey;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Donkey;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Horse.Variant;
public class CraftDonkey extends CraftChestedHorse implements Donkey {
@ -17,11 +16,6 @@ public class CraftDonkey extends CraftChestedHorse implements Donkey {
return "CraftDonkey";
}
@Override
public EntityType getType() {
return EntityType.DONKEY;
}
@Override
public Variant getVariant() {
return Variant.DONKEY;

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDragonFireball.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.projectile.EntityDragonFireball;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.DragonFireball;
import org.bukkit.entity.EntityType;
public class CraftDragonFireball extends CraftFireball implements DragonFireball {
public CraftDragonFireball(CraftServer server, EntityDragonFireball entity) {
@ -14,9 +13,4 @@ public class CraftDragonFireball extends CraftFireball implements DragonFireball
public String toString() {
return "CraftDragonFireball";
}
@Override
public EntityType getType() {
return EntityType.DRAGON_FIREBALL;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityDrowned;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Drowned;
import org.bukkit.entity.EntityType;
public class CraftDrowned extends CraftZombie implements Drowned {
@ -20,9 +19,4 @@ public class CraftDrowned extends CraftZombie implements Drowned {
public String toString() {
return "CraftDrowned";
}
@Override
public EntityType getType() {
return EntityType.DROWNED;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEgg.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.projectile.EntityEgg;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Egg;
import org.bukkit.entity.EntityType;
public class CraftEgg extends CraftThrowableProjectile implements Egg {
public CraftEgg(CraftServer server, EntityEgg entity) {
@ -19,9 +18,4 @@ public class CraftEgg extends CraftThrowableProjectile implements Egg {
public String toString() {
return "CraftEgg";
}
@Override
public EntityType getType() {
return EntityType.EGG;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftElderGuardian.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityGuardianElder;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.ElderGuardian;
import org.bukkit.entity.EntityType;
public class CraftElderGuardian extends CraftGuardian implements ElderGuardian {
@ -16,11 +15,6 @@ public class CraftElderGuardian extends CraftGuardian implements ElderGuardian {
return "CraftElderGuardian";
}
@Override
public EntityType getType() {
return EntityType.ELDER_GUARDIAN;
}
@Override
public boolean isElder() {
return true;

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderCrystal.java
View File

@ -6,7 +6,6 @@ import org.bukkit.Location;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.util.CraftLocation;
import org.bukkit.entity.EnderCrystal;
import org.bukkit.entity.EntityType;
public class CraftEnderCrystal extends CraftEntity implements EnderCrystal {
public CraftEnderCrystal(CraftServer server, EntityEnderCrystal entity) {
@ -49,9 +48,4 @@ public class CraftEnderCrystal extends CraftEntity implements EnderCrystal {
public String toString() {
return "CraftEnderCrystal";
}
@Override
public EntityType getType() {
return EntityType.ENDER_CRYSTAL;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java
View File

@ -13,7 +13,6 @@ import org.bukkit.craftbukkit.boss.CraftDragonBattle;
import org.bukkit.entity.ComplexEntityPart;
import org.bukkit.entity.EnderDragon;
import org.bukkit.entity.EnderDragon.Phase;
import org.bukkit.entity.EntityType;
public class CraftEnderDragon extends CraftMob implements EnderDragon, CraftEnemy {
@ -42,11 +41,6 @@ public class CraftEnderDragon extends CraftMob implements EnderDragon, CraftEnem
return "CraftEnderDragon";
}
@Override
public EntityType getType() {
return EntityType.ENDER_DRAGON;
}
@Override
public Phase getPhase() {
return Phase.values()[getHandle().getEntityData().get(EntityEnderDragon.DATA_PHASE)];

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderPearl.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.projectile.EntityEnderPearl;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EnderPearl;
import org.bukkit.entity.EntityType;
public class CraftEnderPearl extends CraftThrowableProjectile implements EnderPearl {
public CraftEnderPearl(CraftServer server, EntityEnderPearl entity) {
@ -19,9 +18,4 @@ public class CraftEnderPearl extends CraftThrowableProjectile implements EnderPe
public String toString() {
return "CraftEnderPearl";
}
@Override
public EntityType getType() {
return EntityType.ENDER_PEARL;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java
View File

@ -9,7 +9,6 @@ import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.craftbukkit.util.CraftLocation;
import org.bukkit.entity.EnderSignal;
import org.bukkit.entity.EntityType;
import org.bukkit.inventory.ItemStack;
public class CraftEnderSignal extends CraftEntity implements EnderSignal {
@ -27,11 +26,6 @@ public class CraftEnderSignal extends CraftEntity implements EnderSignal {
return "CraftEnderSignal";
}
@Override
public EntityType getType() {
return EntityType.ENDER_SIGNAL;
}
@Override
public Location getTargetLocation() {
return new Location(getWorld(), getHandle().tx, getHandle().ty, getHandle().tz, getHandle().getYRot(), getHandle().getXRot());

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
View File

@ -10,7 +10,6 @@ import org.bukkit.craftbukkit.block.data.CraftBlockData;
import org.bukkit.craftbukkit.util.CraftMagicNumbers;
import org.bukkit.entity.Enderman;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.material.MaterialData;
public class CraftEnderman extends CraftMonster implements Enderman {
@ -50,11 +49,6 @@ public class CraftEnderman extends CraftMonster implements Enderman {
return "CraftEnderman";
}
@Override
public EntityType getType() {
return EntityType.ENDERMAN;
}
@Override
public boolean teleport() {
return getHandle().teleport();

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityEndermite;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Endermite;
import org.bukkit.entity.EntityType;
public class CraftEndermite extends CraftMonster implements Endermite {
@ -21,11 +20,6 @@ public class CraftEndermite extends CraftMonster implements Endermite {
return "CraftEndermite";
}
@Override
public EntityType getType() {
return EntityType.ENDERMITE;
}
@Override
public boolean isPlayerSpawned() {
return false;

12
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
View File

@ -23,6 +23,7 @@ import net.minecraft.world.entity.EntityFlying;
import net.minecraft.world.entity.EntityLightning;
import net.minecraft.world.entity.EntityLiving;
import net.minecraft.world.entity.EntityTameableAnimal;
import net.minecraft.world.entity.EntityTypes;
import net.minecraft.world.entity.GlowSquid;
import net.minecraft.world.entity.Interaction;
import net.minecraft.world.entity.Marker;
@ -163,6 +164,7 @@ import net.minecraft.world.entity.vehicle.EntityMinecartTNT;
import net.minecraft.world.phys.AxisAlignedBB;
import org.bukkit.EntityEffect;
import org.bukkit.Location;
import org.bukkit.Registry;
import org.bukkit.Server;
import org.bukkit.Sound;
import org.bukkit.World;
@ -176,8 +178,10 @@ import org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer;
import org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry;
import org.bukkit.craftbukkit.util.CraftChatMessage;
import org.bukkit.craftbukkit.util.CraftLocation;
import org.bukkit.craftbukkit.util.CraftNamespacedKey;
import org.bukkit.craftbukkit.util.CraftSpawnCategory;
import org.bukkit.craftbukkit.util.CraftVector;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.entity.Pose;
import org.bukkit.entity.SpawnCategory;
@ -200,12 +204,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
protected final CraftServer server;
protected Entity entity;
private final EntityType entityType;
private EntityDamageEvent lastDamageEvent;
private final CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(DATA_TYPE_REGISTRY);
public CraftEntity(final CraftServer server, final Entity entity) {
this.server = server;
this.entity = entity;
EntityType type = Registry.ENTITY_TYPE.get(CraftNamespacedKey.fromMinecraft(EntityTypes.getKey(entity.getType())));
this.entityType = (type != null) ? type : EntityType.UNKNOWN;
}
public static CraftEntity getEntity(CraftServer server, Entity entity) {
@ -755,6 +762,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return entity;
}
@Override
public final EntityType getType() {
return entityType;
}
@Override
public void playEffect(EntityEffect type) {
Preconditions.checkArgument(type != null, "type");

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityEvoker;
import net.minecraft.world.entity.monster.EntityIllagerWizard;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Evoker;
public class CraftEvoker extends CraftSpellcaster implements Evoker {
@ -22,11 +21,6 @@ public class CraftEvoker extends CraftSpellcaster implements Evoker {
return "CraftEvoker";
}
@Override
public EntityType getType() {
return EntityType.EVOKER;
}
@Override
public Evoker.Spell getCurrentSpell() {
return Evoker.Spell.values()[getHandle().getCurrentSpell().ordinal()];

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEvokerFangs.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.EntityLiving;
import net.minecraft.world.entity.projectile.EntityEvokerFangs;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.EvokerFangs;
import org.bukkit.entity.LivingEntity;
@ -23,11 +22,6 @@ public class CraftEvokerFangs extends CraftEntity implements EvokerFangs {
return "CraftEvokerFangs";
}
@Override
public EntityType getType() {
return EntityType.EVOKER_FANGS;
}
@Override
public LivingEntity getOwner() {
EntityLiving owner = getHandle().getOwner();

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.EntityExperienceOrb;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.ExperienceOrb;
public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
@ -29,9 +28,4 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
public String toString() {
return "CraftExperienceOrb";
}
@Override
public EntityType getType() {
return EntityType.EXPERIENCE_ORB;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
View File

@ -6,7 +6,6 @@ import org.bukkit.Material;
import org.bukkit.block.data.BlockData;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.block.data.CraftBlockData;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.FallingBlock;
public class CraftFallingBlock extends CraftEntity implements FallingBlock {
@ -25,11 +24,6 @@ public class CraftFallingBlock extends CraftEntity implements FallingBlock {
return "CraftFallingBlock";
}
@Override
public EntityType getType() {
return EntityType.FALLING_BLOCK;
}
@Override
public Material getMaterial() {
return getBlockData().getMaterial();

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import com.google.common.base.Preconditions;
import net.minecraft.world.entity.projectile.EntityFireball;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Fireball;
import org.bukkit.projectiles.ProjectileSource;
import org.bukkit.util.Vector;
@ -69,9 +68,4 @@ public class CraftFireball extends AbstractProjectile implements Fireball {
public String toString() {
return "CraftFireball";
}
@Override
public EntityType getType() {
return EntityType.UNKNOWN;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
View File

@ -9,7 +9,6 @@ import net.minecraft.world.item.Items;
import org.bukkit.Material;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Firework;
import org.bukkit.entity.LivingEntity;
import org.bukkit.inventory.meta.FireworkMeta;
@ -47,11 +46,6 @@ public class CraftFirework extends CraftProjectile implements Firework {
return "CraftFirework";
}
@Override
public EntityType getType() {
return EntityType.FIREWORK;
}
@Override
public FireworkMeta getFireworkMeta() {
return (FireworkMeta) item.getItemMeta();

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
View File

@ -5,7 +5,6 @@ import net.minecraft.core.BlockPosition;
import net.minecraft.world.entity.projectile.EntityFishingHook;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.FishHook;
public class CraftFishHook extends CraftProjectile implements FishHook {
@ -25,11 +24,6 @@ public class CraftFishHook extends CraftProjectile implements FishHook {
return "CraftFishingHook";
}
@Override
public EntityType getType() {
return EntityType.FISHING_HOOK;
}
@Override
public int getMinWaitTime() {
return getHandle().minWaitTime;

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java
View File

@ -6,7 +6,6 @@ import java.util.UUID;
import net.minecraft.world.entity.animal.EntityFox;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.AnimalTamer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Fox;
import org.bukkit.entity.Fox.Type;
@ -21,11 +20,6 @@ public class CraftFox extends CraftAnimals implements Fox {
return (EntityFox) super.getHandle();
}
@Override
public EntityType getType() {
return EntityType.FOX;
}
@Override
public String toString() {
return "CraftFox";

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFrog.java
View File

@ -7,7 +7,6 @@ import org.bukkit.Registry;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.util.CraftNamespacedKey;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
public class CraftFrog extends CraftAnimals implements org.bukkit.entity.Frog {
@ -25,11 +24,6 @@ public class CraftFrog extends CraftAnimals implements org.bukkit.entity.Frog {
return "CraftFrog";
}
@Override
public EntityType getType() {
return EntityType.FROG;
}
@Override
public Entity getTongueTarget() {
return getHandle().getTongueTarget().map(net.minecraft.world.entity.Entity::getBukkitEntity).orElse(null);

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityGhast;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Ghast;
public class CraftGhast extends CraftFlying implements Ghast, CraftEnemy {
@ -21,11 +20,6 @@ public class CraftGhast extends CraftFlying implements Ghast, CraftEnemy {
return "CraftGhast";
}
@Override
public EntityType getType() {
return EntityType.GHAST;
}
@Override
public boolean isCharging() {
return getHandle().isCharging();

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGiant.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityGiantZombie;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Giant;
public class CraftGiant extends CraftMonster implements Giant {
@ -20,9 +19,4 @@ public class CraftGiant extends CraftMonster implements Giant {
public String toString() {
return "CraftGiant";
}
@Override
public EntityType getType() {
return EntityType.GIANT;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGlowItemFrame.java
View File

@ -1,7 +1,6 @@
package org.bukkit.craftbukkit.entity;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.GlowItemFrame;
public class CraftGlowItemFrame extends CraftItemFrame implements GlowItemFrame {
@ -15,11 +14,6 @@ public class CraftGlowItemFrame extends CraftItemFrame implements GlowItemFrame
return (net.minecraft.world.entity.decoration.GlowItemFrame) super.getHandle();
}
@Override
public EntityType getType() {
return EntityType.GLOW_ITEM_FRAME;
}
@Override
public String toString() {
return "CraftGlowItemFrame{item=" + getItem() + ", rotation=" + getRotation() + "}";

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGlowSquid.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import com.google.common.base.Preconditions;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.GlowSquid;
public class CraftGlowSquid extends CraftSquid implements GlowSquid {
@ -16,11 +15,6 @@ public class CraftGlowSquid extends CraftSquid implements GlowSquid {
return (net.minecraft.world.entity.GlowSquid) super.getHandle();
}
@Override
public EntityType getType() {
return EntityType.GLOW_SQUID;
}
@Override
public String toString() {
return "CraftGlowSquid";

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGoat.java
View File

@ -1,7 +1,6 @@
package org.bukkit.craftbukkit.entity;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Goat;
public class CraftGoat extends CraftAnimals implements Goat {
@ -15,11 +14,6 @@ public class CraftGoat extends CraftAnimals implements Goat {
return (net.minecraft.world.entity.animal.goat.Goat) super.getHandle();
}
@Override
public EntityType getType() {
return EntityType.GOAT;
}
@Override
public String toString() {
return "CraftGoat";

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGuardian.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import com.google.common.base.Preconditions;
import net.minecraft.world.entity.monster.EntityGuardian;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Guardian;
import org.bukkit.entity.LivingEntity;
@ -25,11 +24,6 @@ public class CraftGuardian extends CraftMonster implements Guardian {
return "CraftGuardian";
}
@Override
public EntityType getType() {
return EntityType.GUARDIAN;
}
@Override
public void setTarget(LivingEntity target) {
super.setTarget(target);

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHanging.java
View File

@ -5,7 +5,6 @@ import net.minecraft.world.entity.decoration.EntityHanging;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.block.CraftBlock;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Hanging;
public class CraftHanging extends CraftEntity implements Hanging {
@ -67,9 +66,4 @@ public class CraftHanging extends CraftEntity implements Hanging {
public String toString() {
return "CraftHanging";
}
@Override
public EntityType getType() {
return EntityType.UNKNOWN;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHoglin.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import com.google.common.base.Preconditions;
import net.minecraft.world.entity.monster.hoglin.EntityHoglin;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Hoglin;
public class CraftHoglin extends CraftAnimals implements Hoglin, CraftEnemy {
@ -62,9 +61,4 @@ public class CraftHoglin extends CraftAnimals implements Hoglin, CraftEnemy {
public String toString() {
return "CraftHoglin";
}
@Override
public EntityType getType() {
return EntityType.HOGLIN;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHorse.java
View File

@ -6,7 +6,6 @@ import net.minecraft.world.entity.animal.horse.HorseColor;
import net.minecraft.world.entity.animal.horse.HorseStyle;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftInventoryHorse;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Horse;
import org.bukkit.inventory.HorseInventory;
@ -67,9 +66,4 @@ public class CraftHorse extends CraftAbstractHorse implements Horse {
public String toString() {
return "CraftHorse{variant=" + getVariant() + ", owner=" + getOwner() + '}';
}
@Override
public EntityType getType() {
return EntityType.HORSE;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHusk.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityZombieHusk;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Husk;
public class CraftHusk extends CraftZombie implements Husk {
@ -15,9 +14,4 @@ public class CraftHusk extends CraftZombie implements Husk {
public String toString() {
return "CraftHusk";
}
@Override
public EntityType getType() {
return EntityType.HUSK;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityIllagerIllusioner;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Illusioner;
public class CraftIllusioner extends CraftSpellcaster implements Illusioner {
@ -20,9 +19,4 @@ public class CraftIllusioner extends CraftSpellcaster implements Illusioner {
public String toString() {
return "CraftIllusioner";
}
@Override
public EntityType getType() {
return EntityType.ILLUSIONER;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftInteraction.java
View File

@ -4,7 +4,6 @@ import java.util.UUID;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Interaction;
public class CraftInteraction extends CraftEntity implements Interaction {
@ -23,11 +22,6 @@ public class CraftInteraction extends CraftEntity implements Interaction {
return "CraftInteraction";
}
@Override
public EntityType getType() {
return EntityType.INTERACTION;
}
@Override
public float getInteractionWidth() {
return getHandle().getWidth();

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.EntityIronGolem;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.IronGolem;
public class CraftIronGolem extends CraftGolem implements IronGolem {
@ -29,9 +28,4 @@ public class CraftIronGolem extends CraftGolem implements IronGolem {
public void setPlayerCreated(boolean playerCreated) {
getHandle().setPlayerCreated(playerCreated);
}
@Override
public EntityType getType() {
return EntityType.IRON_GOLEM;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
View File

@ -5,7 +5,6 @@ import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.item.EntityItem;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Item;
import org.bukkit.inventory.ItemStack;
@ -90,9 +89,4 @@ public class CraftItem extends CraftEntity implements Item {
public String toString() {
return "CraftItem";
}
@Override
public EntityType getType() {
return EntityType.DROPPED_ITEM;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemDisplay.java
View File

@ -4,7 +4,6 @@ import com.google.common.base.Preconditions;
import net.minecraft.world.item.ItemDisplayContext;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.ItemDisplay;
import org.bukkit.inventory.ItemStack;
@ -24,11 +23,6 @@ public class CraftItemDisplay extends CraftDisplay implements ItemDisplay {
return "CraftItemDisplay";
}
@Override
public EntityType getType() {
return EntityType.ITEM_DISPLAY;
}
@Override
public ItemStack getItemStack() {
return CraftItemStack.asBukkitCopy(getHandle().getItemStack());

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
View File

@ -10,7 +10,6 @@ import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.block.CraftBlock;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.ItemFrame;
public class CraftItemFrame extends CraftHanging implements ItemFrame {
@ -166,9 +165,4 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
public String toString() {
return "CraftItemFrame{item=" + getItem() + ", rotation=" + getRotation() + "}";
}
@Override
public EntityType getType() {
return EntityType.ITEM_FRAME;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLargeFireball.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.projectile.EntityLargeFireball;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LargeFireball;
public class CraftLargeFireball extends CraftSizedFireball implements LargeFireball {
@ -25,9 +24,4 @@ public class CraftLargeFireball extends CraftSizedFireball implements LargeFireb
public String toString() {
return "CraftLargeFireball";
}
@Override
public EntityType getType() {
return EntityType.FIREBALL;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLeash.java
View File

@ -4,7 +4,6 @@ import com.google.common.base.Preconditions;
import net.minecraft.world.entity.decoration.EntityLeash;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LeashHitch;
public class CraftLeash extends CraftHanging implements LeashHitch {
@ -34,9 +33,4 @@ public class CraftLeash extends CraftHanging implements LeashHitch {
public String toString() {
return "CraftLeash";
}
@Override
public EntityType getType() {
return EntityType.LEASH_HITCH;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.EntityLightning;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LightningStrike;
public class CraftLightningStrike extends CraftEntity implements LightningStrike {
@ -24,9 +23,4 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike
public String toString() {
return "CraftLightningStrike";
}
@Override
public EntityType getType() {
return EntityType.LIGHTNING;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
View File

@ -64,7 +64,6 @@ import org.bukkit.entity.Egg;
import org.bukkit.entity.EnderPearl;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityCategory;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Fireball;
import org.bukkit.entity.Firework;
import org.bukkit.entity.FishHook;
@ -507,11 +506,6 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
return (T) launch.getBukkitEntity();
}
@Override
public EntityType getType() {
return EntityType.UNKNOWN;
}
@Override
public boolean hasLineOfSight(Entity other) {
Preconditions.checkState(!getHandle().generation, "Cannot check line of sight during world generation");

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
View File

@ -4,7 +4,6 @@ import com.google.common.base.Preconditions;
import net.minecraft.world.entity.animal.horse.EntityLlama;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftInventoryLlama;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Horse;
import org.bukkit.entity.Llama;
import org.bukkit.entity.Llama.Color;
@ -60,9 +59,4 @@ public class CraftLlama extends CraftChestedHorse implements Llama {
public String toString() {
return "CraftLlama";
}
@Override
public EntityType getType() {
return EntityType.LLAMA;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLlamaSpit.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.projectile.EntityLlamaSpit;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LlamaSpit;
import org.bukkit.projectiles.ProjectileSource;
@ -22,11 +21,6 @@ public class CraftLlamaSpit extends AbstractProjectile implements LlamaSpit {
return "CraftLlamaSpit";
}
@Override
public EntityType getType() {
return EntityType.LLAMA_SPIT;
}
@Override
public ProjectileSource getShooter() {
return (getHandle().getOwner() != null) ? (ProjectileSource) getHandle().getOwner().getBukkitEntity() : null;

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMagmaCube.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityMagmaCube;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.MagmaCube;
public class CraftMagmaCube extends CraftSlime implements MagmaCube {
@ -20,9 +19,4 @@ public class CraftMagmaCube extends CraftSlime implements MagmaCube {
public String toString() {
return "CraftMagmaCube";
}
@Override
public EntityType getType() {
return EntityType.MAGMA_CUBE;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMarker.java
View File

@ -1,7 +1,6 @@
package org.bukkit.craftbukkit.entity;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Marker;
public class CraftMarker extends CraftEntity implements Marker {
@ -15,11 +14,6 @@ public class CraftMarker extends CraftEntity implements Marker {
return (net.minecraft.world.entity.Marker) super.getHandle();
}
@Override
public EntityType getType() {
return EntityType.MARKER;
}
@Override
public String toString() {
return "CraftMarker";

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.vehicle.EntityMinecartChest;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftInventory;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.minecart.StorageMinecart;
import org.bukkit.inventory.Inventory;
@ -25,9 +24,4 @@ public class CraftMinecartChest extends CraftMinecartContainer implements Storag
public String toString() {
return "CraftMinecartChest{" + "inventory=" + inventory + '}';
}
@Override
public EntityType getType() {
return EntityType.MINECART_CHEST;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java
View File

@ -6,7 +6,6 @@ import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.util.CraftChatMessage;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.minecart.CommandMinecart;
import org.bukkit.permissions.PermissibleBase;
import org.bukkit.permissions.Permission;
@ -47,11 +46,6 @@ public class CraftMinecartCommand extends CraftMinecart implements CommandMineca
return "CraftMinecartCommand";
}
@Override
public EntityType getType() {
return EntityType.MINECART_COMMAND;
}
@Override
public void sendMessage(String message) {
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartFurnace.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import com.google.common.base.Preconditions;
import net.minecraft.world.entity.vehicle.EntityMinecartFurnace;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.minecart.PoweredMinecart;
@SuppressWarnings("deprecation")
@ -32,9 +31,4 @@ public class CraftMinecartFurnace extends CraftMinecart implements PoweredMineca
public String toString() {
return "CraftMinecartFurnace";
}
@Override
public EntityType getType() {
return EntityType.MINECART_FURNACE;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.vehicle.EntityMinecartHopper;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftInventory;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.minecart.HopperMinecart;
import org.bukkit.inventory.Inventory;
@ -20,11 +19,6 @@ public final class CraftMinecartHopper extends CraftMinecartContainer implements
return "CraftMinecartHopper{" + "inventory=" + inventory + '}';
}
@Override
public EntityType getType() {
return EntityType.MINECART_HOPPER;
}
@Override
public Inventory getInventory() {
return inventory;

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartMobSpawner.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.vehicle.EntityMinecartMobSpawner;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.minecart.SpawnerMinecart;
final class CraftMinecartMobSpawner extends CraftMinecart implements SpawnerMinecart {
@ -14,9 +13,4 @@ final class CraftMinecartMobSpawner extends CraftMinecart implements SpawnerMine
public String toString() {
return "CraftMinecartMobSpawner";
}
@Override
public EntityType getType() {
return EntityType.MINECART_MOB_SPAWNER;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartRideable.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.vehicle.EntityMinecartAbstract;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.minecart.RideableMinecart;
public class CraftMinecartRideable extends CraftMinecart implements RideableMinecart {
@ -14,9 +13,4 @@ public class CraftMinecartRideable extends CraftMinecart implements RideableMine
public String toString() {
return "CraftMinecartRideable";
}
@Override
public EntityType getType() {
return EntityType.MINECART;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartTNT.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import com.google.common.base.Preconditions;
import net.minecraft.world.entity.vehicle.EntityMinecartTNT;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.minecart.ExplosiveMinecart;
public final class CraftMinecartTNT extends CraftMinecart implements ExplosiveMinecart {
@ -52,9 +51,4 @@ public final class CraftMinecartTNT extends CraftMinecart implements ExplosiveMi
public String toString() {
return "CraftMinecartTNT";
}
@Override
public EntityType getType() {
return EntityType.MINECART_TNT;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMule.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.horse.EntityHorseMule;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Horse.Variant;
import org.bukkit.entity.Mule;
@ -17,11 +16,6 @@ public class CraftMule extends CraftChestedHorse implements Mule {
return "CraftMule";
}
@Override
public EntityType getType() {
return EntityType.MULE;
}
@Override
public Variant getVariant() {
return Variant.MULE;

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import com.google.common.base.Preconditions;
import net.minecraft.world.entity.animal.EntityMushroomCow;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.MushroomCow;
import org.bukkit.entity.MushroomCow.Variant;
@ -33,9 +32,4 @@ public class CraftMushroomCow extends CraftCow implements MushroomCow {
public String toString() {
return "CraftMushroomCow";
}
@Override
public EntityType getType() {
return EntityType.MUSHROOM_COW;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftOcelot.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.EntityOcelot;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Ocelot;
import org.bukkit.entity.Ocelot.Type;
@ -40,9 +39,4 @@ public class CraftOcelot extends CraftAnimals implements Ocelot {
public String toString() {
return "CraftOcelot";
}
@Override
public EntityType getType() {
return EntityType.OCELOT;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java
View File

@ -7,7 +7,6 @@ import org.bukkit.Art;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.CraftArt;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Painting;
public class CraftPainting extends CraftHanging implements Painting {
@ -62,9 +61,4 @@ public class CraftPainting extends CraftHanging implements Painting {
public String toString() {
return "CraftPainting{art=" + getArt() + "}";
}
@Override
public EntityType getType() {
return EntityType.PAINTING;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPanda.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import com.google.common.base.Preconditions;
import net.minecraft.world.entity.animal.EntityPanda;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Panda;
import org.bukkit.entity.Panda.Gene;
@ -18,11 +17,6 @@ public class CraftPanda extends CraftAnimals implements Panda {
return (EntityPanda) super.getHandle();
}
@Override
public EntityType getType() {
return EntityType.PANDA;
}
@Override
public String toString() {
return "CraftPanda";

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftParrot.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import com.google.common.base.Preconditions;
import net.minecraft.world.entity.animal.EntityParrot;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Parrot;
import org.bukkit.entity.Parrot.Variant;
@ -35,11 +34,6 @@ public class CraftParrot extends CraftTameableAnimal implements Parrot {
return "CraftParrot";
}
@Override
public EntityType getType() {
return EntityType.PARROT;
}
@Override
public boolean isDancing() {
return getHandle().isPartyParrot();

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityPhantom;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Phantom;
public class CraftPhantom extends CraftFlying implements Phantom, CraftEnemy {
@ -30,9 +29,4 @@ public class CraftPhantom extends CraftFlying implements Phantom, CraftEnemy {
public String toString() {
return "CraftPhantom";
}
@Override
public EntityType getType() {
return EntityType.PHANTOM;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPig.java
View File

@ -4,7 +4,6 @@ import com.google.common.base.Preconditions;
import net.minecraft.world.entity.animal.EntityPig;
import org.bukkit.Material;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Pig;
public class CraftPig extends CraftAnimals implements Pig {
@ -66,9 +65,4 @@ public class CraftPig extends CraftAnimals implements Pig {
public String toString() {
return "CraftPig";
}
@Override
public EntityType getType() {
return EntityType.PIG;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPigZombie.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityPigZombie;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.PigZombie;
public class CraftPigZombie extends CraftZombie implements PigZombie {
@ -41,11 +40,6 @@ public class CraftPigZombie extends CraftZombie implements PigZombie {
return "CraftPigZombie";
}
@Override
public EntityType getType() {
return EntityType.ZOMBIFIED_PIGLIN;
}
@Override
public boolean isConverting() {
return false;

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java
View File

@ -10,7 +10,6 @@ import org.bukkit.Material;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftInventory;
import org.bukkit.craftbukkit.util.CraftMagicNumbers;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Piglin;
import org.bukkit.inventory.Inventory;
@ -82,11 +81,6 @@ public class CraftPiglin extends CraftPiglinAbstract implements Piglin {
return (EntityPiglin) super.getHandle();
}
@Override
public EntityType getType() {
return EntityType.PIGLIN;
}
@Override
public String toString() {
return "CraftPiglin";

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglinBrute.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.piglin.EntityPiglinBrute;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.PiglinBrute;
public class CraftPiglinBrute extends CraftPiglinAbstract implements PiglinBrute {
@ -16,11 +15,6 @@ public class CraftPiglinBrute extends CraftPiglinAbstract implements PiglinBrute
return (EntityPiglinBrute) super.getHandle();
}
@Override
public EntityType getType() {
return EntityType.PIGLIN_BRUTE;
}
@Override
public String toString() {
return "CraftPiglinBrute";

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPillager.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityPillager;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftInventory;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Pillager;
import org.bukkit.inventory.Inventory;
@ -18,11 +17,6 @@ public class CraftPillager extends CraftIllager implements Pillager {
return (EntityPillager) super.getHandle();
}
@Override
public EntityType getType() {
return EntityType.PILLAGER;
}
@Override
public String toString() {
return "CraftPillager";

5
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@ -1743,11 +1743,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
}
@Override
public EntityType getType() {
return EntityType.PLAYER;
}
@Override
public void setMetadata(String metadataKey, MetadataValue newMetadataValue) {
server.getPlayerMetadata().setMetadata(this, metadataKey, newMetadataValue);

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.EntityPolarBear;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.PolarBear;
public class CraftPolarBear extends CraftAnimals implements PolarBear {
@ -19,9 +18,4 @@ public class CraftPolarBear extends CraftAnimals implements PolarBear {
public String toString() {
return "CraftPolarBear";
}
@Override
public EntityType getType() {
return EntityType.POLAR_BEAR;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPufferFish.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.EntityPufferFish;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.PufferFish;
public class CraftPufferFish extends CraftFish implements PufferFish {
@ -30,9 +29,4 @@ public class CraftPufferFish extends CraftFish implements PufferFish {
public String toString() {
return "CraftPufferFish";
}
@Override
public EntityType getType() {
return EntityType.PUFFERFISH;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java
View File

@ -5,7 +5,6 @@ import net.minecraft.world.entity.animal.EntityRabbit;
import net.minecraft.world.level.World;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Rabbit;
import org.bukkit.entity.Rabbit.Type;
@ -25,11 +24,6 @@ public class CraftRabbit extends CraftAnimals implements Rabbit {
return "CraftRabbit{RabbitType=" + getRabbitType() + "}";
}
@Override
public EntityType getType() {
return EntityType.RABBIT;
}
@Override
public Type getRabbitType() {
return Type.values()[getHandle().getVariant().ordinal()];

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftRavager.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityRavager;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Ravager;
public class CraftRavager extends CraftRaider implements Ravager {
@ -16,11 +15,6 @@ public class CraftRavager extends CraftRaider implements Ravager {
return (EntityRavager) super.getHandle();
}
@Override
public EntityType getType() {
return EntityType.RAVAGER;
}
@Override
public String toString() {
return "CraftRavager";

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSalmon.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.EntitySalmon;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Salmon;
public class CraftSalmon extends CraftFish implements Salmon {
@ -20,9 +19,4 @@ public class CraftSalmon extends CraftFish implements Salmon {
public String toString() {
return "CraftSalmon";
}
@Override
public EntityType getType() {
return EntityType.SALMON;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java
View File

@ -4,7 +4,6 @@ import net.minecraft.world.entity.animal.EntitySheep;
import net.minecraft.world.item.EnumColor;
import org.bukkit.DyeColor;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Sheep;
public class CraftSheep extends CraftAnimals implements Sheep {
@ -41,9 +40,4 @@ public class CraftSheep extends CraftAnimals implements Sheep {
public String toString() {
return "CraftSheep";
}
@Override
public EntityType getType() {
return EntityType.SHEEP;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftShulker.java
View File

@ -6,7 +6,6 @@ import org.bukkit.DyeColor;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.block.CraftBlock;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Shulker;
public class CraftShulker extends CraftGolem implements Shulker, CraftEnemy {
@ -20,11 +19,6 @@ public class CraftShulker extends CraftGolem implements Shulker, CraftEnemy {
return "CraftShulker";
}
@Override
public EntityType getType() {
return EntityType.SHULKER;
}
@Override
public EntityShulker getHandle() {
return (EntityShulker) entity;

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftShulkerBullet.java
View File

@ -4,7 +4,6 @@ import com.google.common.base.Preconditions;
import net.minecraft.world.entity.projectile.EntityShulkerBullet;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.ShulkerBullet;
import org.bukkit.projectiles.ProjectileSource;
@ -46,11 +45,6 @@ public class CraftShulkerBullet extends AbstractProjectile implements ShulkerBul
return "CraftShulkerBullet";
}
@Override
public EntityType getType() {
return EntityType.SHULKER_BULLET;
}
@Override
public EntityShulkerBullet getHandle() {
return (EntityShulkerBullet) entity;

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSilverfish.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntitySilverfish;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Silverfish;
public class CraftSilverfish extends CraftMonster implements Silverfish {
@ -19,9 +18,4 @@ public class CraftSilverfish extends CraftMonster implements Silverfish {
public String toString() {
return "CraftSilverfish";
}
@Override
public EntityType getType() {
return EntityType.SILVERFISH;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import com.google.common.base.Preconditions;
import net.minecraft.world.entity.monster.EntitySkeleton;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Skeleton;
public class CraftSkeleton extends CraftAbstractSkeleton implements Skeleton {
@ -43,11 +42,6 @@ public class CraftSkeleton extends CraftAbstractSkeleton implements Skeleton {
return "CraftSkeleton";
}
@Override
public EntityType getType() {
return EntityType.SKELETON;
}
@Override
public SkeletonType getSkeletonType() {
return SkeletonType.NORMAL;

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.horse.EntityHorseSkeleton;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Horse.Variant;
import org.bukkit.entity.SkeletonHorse;
@ -17,11 +16,6 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo
return "CraftSkeletonHorse";
}
@Override
public EntityType getType() {
return EntityType.SKELETON_HORSE;
}
@Override
public Variant getVariant() {
return Variant.SKELETON_HORSE;

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntitySlime;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Slime;
public class CraftSlime extends CraftMob implements Slime, CraftEnemy {
@ -30,9 +29,4 @@ public class CraftSlime extends CraftMob implements Slime, CraftEnemy {
public String toString() {
return "CraftSlime";
}
@Override
public EntityType getType() {
return EntityType.SLIME;
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSmallFireball.java
View File

@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.projectile.EntitySmallFireball;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.SmallFireball;
public class CraftSmallFireball extends CraftSizedFireball implements SmallFireball {
@ -19,9 +18,4 @@ public class CraftSmallFireball extends CraftSizedFireball implements SmallFireb
public String toString() {
return "CraftSmallFireball";
}
@Override
public EntityType getType() {
return EntityType.SMALL_FIREBALL;
}
}

Some files were not shown because too many files have changed in this diff Show More