Re-add dropped patches, mojang missed some stuff

1 files changed, 0 insertions, 1365 deletions

diff --git a/patches/server/0572-Missing-Entity-API.patch b/patches/server/0572-Missing-Entity-API.patch
deleted file mode 100644
index 0f3d205a48..0000000000
--- a/patches/server/0572-Missing-Entity-API.patch
+++ /dev/null
@@ -1,1365 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <[email protected]>
-Date: Mon, 21 Jun 2021 23:56:07 -0400
-Subject: [PATCH] Missing Entity API
-
-== AT ==
-public net.minecraft.world.entity.animal.Fox isDefending()Z
-public net.minecraft.world.entity.animal.Fox setDefending(Z)V
-public net.minecraft.world.entity.animal.Fox setFaceplanted(Z)V
-public net.minecraft.world.entity.animal.Panda getEatCounter()I
-public net.minecraft.world.entity.animal.Panda setEatCounter(I)V
-public net.minecraft.world.entity.animal.Bee isRolling()Z
-public net.minecraft.world.entity.animal.Bee setRolling(Z)V
-public net.minecraft.world.entity.animal.Bee numCropsGrownSincePollination
-public net.minecraft.world.entity.animal.Bee ticksWithoutNectarSinceExitingHive
-public net.minecraft.world.entity.monster.piglin.Piglin isChargingCrossbow()Z
-public net.minecraft.world.entity.ambient.Bat targetPosition
-public net.minecraft.world.entity.monster.Ravager attackTick
-public net.minecraft.world.entity.monster.Ravager stunnedTick
-public net.minecraft.world.entity.monster.Ravager roarTick
-public net.minecraft.world.entity.vehicle.MinecartTNT explode(D)V
-public net.minecraft.world.entity.vehicle.MinecartTNT fuse
-public net.minecraft.world.entity.monster.Endermite life
-public net.minecraft.world.entity.projectile.AbstractArrow soundEvent
-public net.minecraft.world.entity.monster.Phantom anchorPoint
-public net.minecraft.world.entity.npc.WanderingTrader getWanderTarget()Lnet/minecraft/core/BlockPos;
-public net.minecraft.world.entity.animal.AbstractSchoolingFish leader
-public net.minecraft.world.entity.animal.AbstractSchoolingFish schoolSize
-public net.minecraft.world.entity.animal.Rabbit moreCarrotTicks
-public net.minecraft.world.entity.AreaEffectCloud ownerUUID
-public net.minecraft.world.entity.animal.MushroomCow stewEffects
-public net.minecraft.world.entity.Entity FLAG_INVISIBLE
-public net.minecraft.world.entity.animal.Cat setRelaxStateOne(Z)V
-public net.minecraft.world.entity.animal.Cat isRelaxStateOne()Z
-
-Co-authored-by: Nassim Jahnke <[email protected]>
-Co-authored-by: Jake Potrebic <[email protected]>
-Co-authored-by: William Blake Galbreath <[email protected]>
-Co-authored-by: SoSeDiK <[email protected]>
-Co-authored-by: booky10 <[email protected]>
-Co-authored-by: Amin <[email protected]>
-Co-authored-by: TrollyLoki <[email protected]>
-Co-authored-by: FireInstall <[email protected]>
-Co-authored-by: maxcom1 <[email protected]>
-
-diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
-index 55e85267c7cbd8be5d2da212e33c43fb353f2e12..c72d6bccf7d72d08d388c65936a89c92261c7860 100644
---- a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
-+++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
-@@ -165,7 +165,7 @@ public class MobGoalHelper {
-         bukkitMap.put(net.minecraft.world.entity.monster.Endermite.class, Endermite.class);
-         bukkitMap.put(net.minecraft.world.entity.monster.Evoker.class, Evoker.class);
-         bukkitMap.put(AbstractFish.class, Fish.class);
--        bukkitMap.put(AbstractSchoolingFish.class, Fish.class); // close enough
-+        bukkitMap.put(AbstractSchoolingFish.class, io.papermc.paper.entity.SchoolableFish.class);
-         bukkitMap.put(FlyingMob.class, Flying.class);
-         bukkitMap.put(net.minecraft.world.entity.animal.Fox.class, Fox.class);
-         bukkitMap.put(net.minecraft.world.entity.monster.Ghast.class, Ghast.class);
-diff --git a/src/main/java/io/papermc/paper/entity/PaperSchoolableFish.java b/src/main/java/io/papermc/paper/entity/PaperSchoolableFish.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..41bf71d116ffc5431586ce54abba7f8def6c1dcf
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/entity/PaperSchoolableFish.java
-@@ -0,0 +1,52 @@
-+package io.papermc.paper.entity;
-+
-+import net.minecraft.world.entity.animal.AbstractSchoolingFish;
-+import org.bukkit.craftbukkit.CraftServer;
-+import org.bukkit.craftbukkit.entity.CraftFish;
-+import org.jetbrains.annotations.NotNull;
-+
-+public class PaperSchoolableFish extends CraftFish implements SchoolableFish {
-+
-+    public PaperSchoolableFish(CraftServer server, AbstractSchoolingFish entity) {
-+        super(server, entity);
-+    }
-+
-+    @Override
-+    public AbstractSchoolingFish getHandle() {
-+        return (AbstractSchoolingFish) super.getHandle();
-+    }
-+
-+    @Override
-+    public void startFollowing(@NotNull SchoolableFish fish) {
-+        if (this.getHandle().isFollower()) { // If following a fish already, properly remove the old one
-+            this.stopFollowing();
-+        }
-+
-+        this.getHandle().startFollowing(((PaperSchoolableFish) fish).getHandle());
-+    }
-+
-+    @Override
-+    public void stopFollowing() {
-+        this.getHandle().stopFollowing();
-+    }
-+
-+    @Override
-+    public int getSchoolSize() {
-+        return this.getHandle().schoolSize;
-+    }
-+
-+    @Override
-+    public int getMaxSchoolSize() {
-+        return this.getHandle().getMaxSchoolSize();
-+    }
-+
-+    @Override
-+    public SchoolableFish getSchoolLeader() {
-+        AbstractSchoolingFish leader = this.getHandle().leader;
-+        if (leader == null) {
-+            return null;
-+        }
-+
-+        return (SchoolableFish) leader.getBukkitEntity();
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/world/entity/animal/AbstractSchoolingFish.java b/src/main/java/net/minecraft/world/entity/animal/AbstractSchoolingFish.java
-index 2cd61138dfaa82fa698ef8d32d690f51f621ee3b..957eb2ba3f647f70522243fedf36b921e58142bd 100644
---- a/src/main/java/net/minecraft/world/entity/animal/AbstractSchoolingFish.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/AbstractSchoolingFish.java
-@@ -51,6 +51,7 @@ public abstract class AbstractSchoolingFish extends AbstractFish {
-     }
- 
-     public void stopFollowing() {
-+        if (this.leader == null) return; // Avoid NPE, plugins can now set the leader and certain fish goals might cause this method to be called
-         this.leader.removeFollower();
-         this.leader = null;
-     }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index d4389172c3c006ebec5d9cd8213cdd499ab39b68..d317b8500e8d2c280e52140440cf2b9cb61c3b28 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -543,11 +543,13 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
-         this.setFlag(4, hasStung);
-     }
- 
-+    public net.kyori.adventure.util.TriState rollingOverride = net.kyori.adventure.util.TriState.NOT_SET; // Paper - Rolling override
-     public boolean isRolling() {
-         return this.getFlag(2);
-     }
- 
-     public void setRolling(boolean nearTarget) {
-+        nearTarget = rollingOverride.toBooleanOrElse(nearTarget); // Paper - Rolling override
-         this.setFlag(2, nearTarget);
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-index 864cb9bd4c71e41cf2ed165e5d252ccb613de6cb..290d41136f5ec7671bc4990dfe50da0a770c124d 100644
---- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-@@ -50,6 +50,7 @@ public class Tadpole extends AbstractFish {
-     public int age;
-     protected static final ImmutableList<SensorType<? extends Sensor<? super Tadpole>>> SENSOR_TYPES = ImmutableList.of(SensorType.NEAREST_LIVING_ENTITIES, SensorType.NEAREST_PLAYERS, SensorType.HURT_BY, SensorType.FROG_TEMPTATIONS);
-     protected static final ImmutableList<MemoryModuleType<?>> MEMORY_TYPES = ImmutableList.of(MemoryModuleType.LOOK_TARGET, MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES, MemoryModuleType.WALK_TARGET, MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, MemoryModuleType.PATH, MemoryModuleType.NEAREST_VISIBLE_ADULT, MemoryModuleType.TEMPTATION_COOLDOWN_TICKS, MemoryModuleType.IS_TEMPTED, MemoryModuleType.TEMPTING_PLAYER, MemoryModuleType.BREED_TARGET, MemoryModuleType.IS_PANICKING);
-+    public boolean ageLocked; // Paper
- 
-     public Tadpole(EntityType<? extends AbstractFish> type, Level world) {
-         super(type, world);
-@@ -100,7 +101,7 @@ public class Tadpole extends AbstractFish {
-     @Override
-     public void aiStep() {
-         super.aiStep();
--        if (!this.level().isClientSide) {
-+        if (!this.level().isClientSide && !this.ageLocked) { // Paper
-             this.setAge(this.age + 1);
-         }
- 
-@@ -110,12 +111,14 @@ public class Tadpole extends AbstractFish {
-     public void addAdditionalSaveData(CompoundTag nbt) {
-         super.addAdditionalSaveData(nbt);
-         nbt.putInt("Age", this.age);
-+        nbt.putBoolean("AgeLocked", this.ageLocked); // Paper
-     }
- 
-     @Override
-     public void readAdditionalSaveData(CompoundTag nbt) {
-         super.readAdditionalSaveData(nbt);
-         this.setAge(nbt.getInt("Age"));
-+        this.ageLocked = nbt.getBoolean("AgeLocked"); // Paper
-     }
- 
-     @Nullable
-@@ -167,6 +170,7 @@ public class Tadpole extends AbstractFish {
-         Bucketable.saveDefaultDataToBucketTag(this, stack);
-         CustomData.update(DataComponents.BUCKET_ENTITY_DATA, stack, (nbttagcompound) -> {
-             nbttagcompound.putInt("Age", this.getAge());
-+            nbttagcompound.putBoolean("AgeLocked", this.ageLocked); // Paper
-         });
-     }
- 
-@@ -177,6 +181,7 @@ public class Tadpole extends AbstractFish {
-             this.setAge(nbt.getInt("Age"));
-         }
- 
-+        this.ageLocked = nbt.getBoolean("AgeLocked"); // Paper
-     }
- 
-     @Override
-@@ -208,6 +213,7 @@ public class Tadpole extends AbstractFish {
-     }
- 
-     private void ageUp(int seconds) {
-+        if (this.ageLocked) return; // Paper
-         this.setAge(this.age + seconds * 20);
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-index d53ef42e64d87790ea86d806153f047005accb9f..57952ad65c905265799ba2d8f99cc4cf4aa69f94 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-@@ -753,6 +753,15 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
- 
-     }
- 
-+    // Paper start - Horse API
-+    public void setMouthOpen(boolean open) {
-+        this.setFlag(FLAG_OPEN_MOUTH, open);
-+    }
-+    public boolean isMouthOpen() {
-+        return this.getFlag(FLAG_OPEN_MOUTH);
-+    }
-+    // Paper end - Horse API
-+
-     @Override
-     public InteractionResult mobInteract(Player player, InteractionHand hand) {
-         if (!this.isVehicle() && !this.isBaby()) {
-@@ -795,6 +804,11 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
-         this.setFlag(16, eatingGrass);
-     }
- 
-+    // Paper start - Horse API
-+    public void setForceStanding(boolean standing) {
-+        this.setFlag(FLAG_STANDING, standing);
-+    }
-+    // Paper end - Horse API
-     public void setStanding(boolean angry) {
-         if (angry) {
-             this.setEating(false);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-index 37da58385ecf40baeb4665a0d9c262da03c01763..4fa1a12e7e5c23e1d902b59f2a315eac64134aa8 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-@@ -74,7 +74,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
-     @Nullable
-     private Llama caravanHead;
-     @Nullable
--    private Llama caravanTail;
-+    public Llama caravanTail; // Paper
- 
-     public Llama(EntityType<? extends Llama> type, Level world) {
-         super(type, world);
-diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index b0ac85dc3c67d2e4d70dfb09d4e8fc349aba14d2..b5cb4e4682f66ac9423af8d1547d0f1a4f9e6c5d 100644
---- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -88,6 +88,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
-         return !entityliving.getType().is(EntityTypeTags.WITHER_FRIENDS) && entityliving.attackable();
-     };
-     private static final TargetingConditions TARGETING_CONDITIONS = TargetingConditions.forCombat().range(20.0D).selector(WitherBoss.LIVING_ENTITY_SELECTOR);
-+    // Paper start
-+    private boolean canPortal = false;
-+
-+    public void setCanTravelThroughPortals(boolean canPortal) { this.canPortal = canPortal; }
-+    // Paper end
- 
-     public WitherBoss(EntityType<? extends WitherBoss> type, Level world) {
-         super(type, world);
-@@ -594,7 +599,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
- 
-     @Override
-     public boolean canChangeDimensions() {
--        return false;
-+        return super.canChangeDimensions() && canPortal; // Paper
-     }
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 853d65025d5e049467c1f1e7322580880506c347..57f84a0eccbdb051adddc25a1a7126f60c7c274b 100644
---- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -440,6 +440,16 @@ public class EnderMan extends Monster implements NeutralMob {
-         this.entityData.set(EnderMan.DATA_STARED_AT, true);
-     }
- 
-+    // Paper start
-+    public void setCreepy(boolean creepy) {
-+        this.entityData.set(EnderMan.DATA_CREEPY, creepy);
-+    }
-+
-+    public void setHasBeenStaredAt(boolean hasBeenStaredAt) {
-+        this.entityData.set(EnderMan.DATA_STARED_AT, hasBeenStaredAt);
-+    }
-+    // Paper end
-+
-     @Override
-     public boolean requiresCustomPersistence() {
-         return super.requiresCustomPersistence() || this.getCarriedBlock() != null;
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Ghast.java b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
-index ba7104784cbbbb6eeacf0ca333af20212f6c47b0..373a4f036157017b0d95e8f1849780582235a549 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
-@@ -65,6 +65,12 @@ public class Ghast extends FlyingMob implements Enemy {
-         return this.explosionPower;
-     }
- 
-+    // Paper start
-+    public void setExplosionPower(int explosionPower) {
-+        this.explosionPower = explosionPower;
-+    }
-+    // Paper end
-+
-     @Override
-     protected boolean shouldDespawnInPeaceful() {
-         return true;
-diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-index b6653a942b07c2d1f7774054a68bf04d547d7cc0..deedc707971be0bd1b7757f4e9b6d2729cc669d0 100644
---- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-@@ -202,6 +202,12 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
-     }
- 
-     public void startConverting(@Nullable UUID uuid, int delay) {
-+    // Paper start - missing entity behaviour api - converting without entity event
-+        this.startConverting(uuid, delay, true);
-+    }
-+
-+    public void startConverting(@Nullable UUID uuid, int delay, boolean broadcastEntityEvent) {
-+    // Paper end - missing entity behaviour api - converting without entity event
-         this.conversionStarter = uuid;
-         this.villagerConversionTime = delay;
-         this.getEntityData().set(ZombieVillager.DATA_CONVERTING_ID, true);
-@@ -209,7 +215,7 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
-         this.removeEffect(MobEffects.WEAKNESS, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.CONVERSION);
-         this.addEffect(new MobEffectInstance(MobEffects.DAMAGE_BOOST, delay, Math.min(this.level().getDifficulty().getId() - 1, 0)), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.CONVERSION);
-         // CraftBukkit end
--        this.level().broadcastEntityEvent(this, (byte) 16);
-+        if (broadcastEntityEvent) this.level().broadcastEntityEvent(this, (byte) 16); // Paper - missing entity behaviour api - converting without entity event
-     }
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
-index 636638bfee54618b36b09d49a76a46d47e1d09b4..c75ac52f302e8e29e0bdea32c85ccf6713257a9b 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
-@@ -105,6 +105,20 @@ public class ThrownTrident extends AbstractArrow {
-         return (Boolean) this.entityData.get(ThrownTrident.ID_FOIL);
-     }
- 
-+    // Paper start
-+    public void setFoil(boolean foil) {
-+        this.entityData.set(ThrownTrident.ID_FOIL, foil);
-+    }
-+
-+    public int getLoyalty() {
-+        return this.entityData.get(ThrownTrident.ID_LOYALTY);
-+    }
-+
-+    public void setLoyalty(byte loyalty) {
-+        this.entityData.set(ThrownTrident.ID_LOYALTY, loyalty);
-+    }
-+    // Paper end
-+
-     @Nullable
-     @Override
-     protected EntityHitResult findHitEntity(Vec3 currentPosition, Vec3 nextPosition) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index 3952e52b94c1cc97e1d2d3885f59d7690efb74ad..9bcc0931510607b8fbd01233e2b3c346369b214d 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-@@ -114,4 +114,36 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
-     public AbstractHorseInventory getInventory() {
-         return new CraftSaddledInventory(getHandle().inventory);
-     }
-+
-+    // Paper start - Horse API
-+    @Override
-+    public boolean isEatingGrass() {
-+        return this.getHandle().isEating();
-+    }
-+
-+    @Override
-+    public void setEatingGrass(boolean eating) {
-+        this.getHandle().setEating(eating);
-+    }
-+
-+    @Override
-+    public boolean isRearing() {
-+        return this.getHandle().isStanding();
-+    }
-+
-+    @Override
-+    public void setRearing(boolean rearing) {
-+        this.getHandle().setForceStanding(rearing);
-+    }
-+
-+    @Override
-+    public boolean isEating() {
-+        return this.getHandle().isMouthOpen();
-+    }
-+
-+    @Override
-+    public void setEating(boolean eating) {
-+       this.getHandle().setMouthOpen(eating);
-+    }
-+    // Paper end - Horse API
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java
-index a865b981f919c6784ae7c7c551e6a2a1ba0310d5..af35ff560a02daca7a130322fccbb52160e2db98 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java
-@@ -218,4 +218,17 @@ public class CraftAreaEffectCloud extends CraftEntity implements AreaEffectCloud
-             this.getHandle().setOwner(null);
-         }
-     }
-+
-+    // Paper start - owner API
-+    @Override
-+    public java.util.UUID getOwnerUniqueId() {
-+        return this.getHandle().ownerUUID;
-+    }
-+
-+    @Override
-+    public void setOwnerUniqueId(final java.util.UUID ownerUuid) {
-+        this.getHandle().setOwner(null);
-+        this.getHandle().ownerUUID = ownerUuid;
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftBat.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftBat.java
-index b0a3531476f5a05ae846b68d825eddc35ebddea9..1bb72f28085f3885bec068b586ec222111044884 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftBat.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftBat.java
-@@ -27,4 +27,25 @@ public class CraftBat extends CraftAmbient implements Bat {
-     public void setAwake(boolean state) {
-         this.getHandle().setResting(!state);
-     }
-+    // Paper start
-+    @Override
-+    public org.bukkit.Location getTargetLocation() {
-+        net.minecraft.core.BlockPos pos = this.getHandle().targetPosition;
-+        if (pos == null) {
-+            return null;
-+        }
-+
-+        return io.papermc.paper.util.MCUtil.toLocation(this.getHandle().level(), pos);
-+    }
-+
-+    @Override
-+    public void setTargetLocation(org.bukkit.Location location) {
-+        net.minecraft.core.BlockPos pos = null;
-+        if (location != null) {
-+            pos = io.papermc.paper.util.MCUtil.toBlockPosition(location);
-+        }
-+
-+        this.getHandle().targetPosition = pos;
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftBee.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftBee.java
-index cfff1be6a4a4936a2dadb2590abc3d33c123d048..3dac93b0ab5d5acf5b33dc4b0efed60319eb657b 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftBee.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftBee.java
-@@ -86,4 +86,42 @@ public class CraftBee extends CraftAnimals implements Bee {
-     public void setCannotEnterHiveTicks(int ticks) {
-         this.getHandle().setStayOutOfHiveCountdown(ticks);
-     }
-+    // Paper start
-+    @Override
-+    public void setRollingOverride(net.kyori.adventure.util.TriState rolling) {
-+        this.getHandle().rollingOverride = rolling;
-+
-+        this.getHandle().setRolling(this.getHandle().isRolling()); // Refresh rolling state
-+    }
-+
-+    @Override
-+    public boolean isRolling() {
-+        return this.getRollingOverride().toBooleanOrElse(this.getHandle().isRolling());
-+    }
-+
-+    @Override
-+    public net.kyori.adventure.util.TriState getRollingOverride() {
-+        return this.getHandle().rollingOverride;
-+    }
-+
-+    @Override
-+    public void setCropsGrownSincePollination(int crops) {
-+        this.getHandle().numCropsGrownSincePollination = crops;
-+    }
-+
-+    @Override
-+    public int getCropsGrownSincePollination() {
-+        return this.getHandle().numCropsGrownSincePollination;
-+    }
-+
-+    @Override
-+    public void setTicksSincePollination(int ticks) {
-+        this.getHandle().ticksWithoutNectarSinceExitingHive = ticks;
-+    }
-+
-+    @Override
-+    public int getTicksSincePollination() {
-+        return this.getHandle().ticksWithoutNectarSinceExitingHive;
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java
-index 760e8a59fd1a13d3af722bc18999f943a05151fe..a565ac47b3dc9a27e043fc9cb00b6dea950f08cf 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java
-@@ -84,4 +84,26 @@ public class CraftCat extends CraftTameableAnimal implements Cat {
-                     + ", this can happen if a plugin creates its own cat variant with out properly registering it.");
-         }
-     }
-+
-+    // Paper start - More cat api
-+    @Override
-+    public void setLyingDown(boolean lyingDown) {
-+        this.getHandle().setLying(lyingDown);
-+    }
-+
-+    @Override
-+    public boolean isLyingDown() {
-+        return this.getHandle().isLying();
-+    }
-+
-+    @Override
-+    public void setHeadUp(boolean headUp) {
-+        this.getHandle().setRelaxStateOne(headUp);
-+    }
-+
-+    @Override
-+    public boolean isHeadUp() {
-+        return this.getHandle().isRelaxStateOne();
-+    }
-+    // Paper end - More cat api
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java
-index 64b75682a936e071353707f7615d6ff512fd617d..96f6e2fd9c6b20d34122abfe5c7fba732502d5a0 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java
-@@ -18,4 +18,26 @@ public class CraftChicken extends CraftAnimals implements Chicken {
-     public String toString() {
-         return "CraftChicken";
-     }
-+
-+    // Paper start
-+    @Override
-+    public boolean isChickenJockey() {
-+        return this.getHandle().isChickenJockey();
-+    }
-+
-+    @Override
-+    public void setIsChickenJockey(boolean isChickenJockey) {
-+        this.getHandle().setChickenJockey(isChickenJockey);
-+    }
-+
-+    @Override
-+    public int getEggLayTime() {
-+        return this.getHandle().eggTime;
-+    }
-+
-+    @Override
-+    public void setEggLayTime(int eggLayTime) {
-+        this.getHandle().eggTime = eggLayTime;
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCod.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCod.java
-index fa0bf7db880063427ba12df1df1c72240fff93e9..63e6b07e3b159c74d9ef17be20b5ab43d07f0f5f 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCod.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCod.java
-@@ -3,7 +3,7 @@ package org.bukkit.craftbukkit.entity;
- import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.entity.Cod;
- 
--public class CraftCod extends CraftFish implements Cod {
-+public class CraftCod extends io.papermc.paper.entity.PaperSchoolableFish implements Cod { // Paper - School Fish API
- 
-     public CraftCod(CraftServer server, net.minecraft.world.entity.animal.Cod entity) {
-         super(server, entity);
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftDolphin.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftDolphin.java
-index af432f9a1d255a56c31c3b97aeb4457d17f37e3e..f93f8f6509b12eb9b1e07c829278bb0822dd7988 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftDolphin.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftDolphin.java
-@@ -18,4 +18,36 @@ public class CraftDolphin extends CraftWaterMob implements Dolphin {
-     public String toString() {
-         return "CraftDolphin";
-     }
-+
-+    // Paper start - Missing Dolphin API
-+    @Override
-+    public int getMoistness() {
-+        return this.getHandle().getMoistnessLevel();
-+    }
-+
-+    @Override
-+    public void setMoistness(int moistness) {
-+        this.getHandle().setMoisntessLevel(moistness);
-+    }
-+
-+    @Override
-+    public void setHasFish(boolean hasFish) {
-+        this.getHandle().setGotFish(hasFish);
-+    }
-+
-+    @Override
-+    public boolean hasFish() {
-+        return this.getHandle().gotFish();
-+    }
-+
-+    @Override
-+    public org.bukkit.Location getTreasureLocation() {
-+        return io.papermc.paper.util.MCUtil.toLocation(this.getHandle().level(), this.getHandle().getTreasurePos());
-+    }
-+
-+    @Override
-+    public void setTreasureLocation(org.bukkit.Location location) {
-+        this.getHandle().setTreasurePos(io.papermc.paper.util.MCUtil.toBlockPosition(location));
-+    }
-+    // Paper end - Missing Dolphin API
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
-index 21dc209e6f98b6306833b41e2763e746047d5a94..983b9d6ddb58eff297e96e5c8b28ec427efa267d 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
-@@ -40,6 +40,28 @@ public class CraftEnderman extends CraftMonster implements Enderman {
-         this.getHandle().setCarriedBlock(blockData == null ? null : ((CraftBlockData) blockData).getState());
-     }
- 
-+    // Paper start
-+    @Override
-+    public boolean isScreaming() {
-+        return this.getHandle().isCreepy();
-+    }
-+
-+    @Override
-+    public void setScreaming(boolean screaming) {
-+        this.getHandle().setCreepy(screaming);
-+    }
-+
-+    @Override
-+    public boolean hasBeenStaredAt() {
-+        return this.getHandle().hasBeenStaredAt();
-+    }
-+
-+    @Override
-+    public void setHasBeenStaredAt(boolean hasBeenStaredAt) {
-+        this.getHandle().setHasBeenStaredAt(hasBeenStaredAt);
-+    }
-+    // Paper end
-+
-     @Override
-     public EnderMan getHandle() {
-         return (EnderMan) this.entity;
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java
-index fc0f0e841dc974d080e1abb9bbafb5165801131f..d657fd2c507a5b215aeab0a5f3e9c2ee892a27c8 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java
-@@ -28,4 +28,15 @@ public class CraftEndermite extends CraftMonster implements Endermite {
-     public void setPlayerSpawned(boolean playerSpawned) {
-         // Nop
-     }
-+    // Paper start
-+    @Override
-+    public void setLifetimeTicks(int ticks) {
-+        this.getHandle().life = ticks;
-+    }
-+
-+    @Override
-+    public int getLifetimeTicks() {
-+        return this.getHandle().life;
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index d30e1dd1b4525674c8a52da9b677c09a251b2467..9edcdc71b28cf08e42fbe44723ba540e8d4f7808 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1067,4 +1067,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-         return set;
-     }
-     // Paper end - tracked players API
-+
-+    // Paper start - missing entity api
-+    @Override
-+    public boolean isInvisible() {  // Paper - moved up from LivingEntity
-+        return this.getHandle().isInvisible();
-+    }
-+
-+    @Override
-+    public void setInvisible(boolean invisible) {  // Paper - moved up from LivingEntity
-+        this.getHandle().persistentInvisibility = invisible;
-+        this.getHandle().setSharedFlag(Entity.FLAG_INVISIBLE, invisible);
-+    }
-+
-+    @Override
-+    public void setNoPhysics(boolean noPhysics) {
-+        this.getHandle().noPhysics = noPhysics;
-+    }
-+
-+    @Override
-+    public boolean hasNoPhysics() {
-+        return this.getHandle().noPhysics;
-+    }
-+    // Paper end - missing entity api
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
-index 837ae825e00feafaea87aa9d318998b0f30791d8..3815b68e139702f3f97c4fa2a77a0314d83fa758 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
-@@ -59,6 +59,20 @@ public class CraftFireball extends AbstractProjectile implements Fireball {
-         this.update(); // SPIGOT-6579
-     }
- 
-+    // Paper start - Expose power on fireball projectiles
-+    @Override
-+    public void setPower(final Vector power) {
-+        this.getHandle().xPower = power.getX();
-+        this.getHandle().yPower = power.getY();
-+        this.getHandle().zPower = power.getZ();
-+    }
-+
-+    @Override
-+    public Vector getPower() {
-+        return new Vector(this.getHandle().xPower, this.getHandle().yPower, this.getHandle().zPower);
-+    }
-+    // Paper end - Expose power on fireball projectiles
-+
-     @Override
-     public AbstractHurtingProjectile getHandle() {
-         return (AbstractHurtingProjectile) this.entity;
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java
-index 17164811bbcf983bef62c47bc99330074762267b..c455deb4fd2a7684bcc01a8212c362a2375c190b 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java
-@@ -113,4 +113,41 @@ public class CraftFox extends CraftAnimals implements Fox {
-     public boolean isFaceplanted() {
-         return this.getHandle().isFaceplanted();
-     }
-+
-+    // Paper start - Add more fox behavior API
-+    @Override
-+    public void setInterested(boolean interested) {
-+        this.getHandle().setIsInterested(interested);
-+    }
-+
-+    @Override
-+    public boolean isInterested() {
-+        return this.getHandle().isInterested();
-+    }
-+
-+    @Override
-+    public void setLeaping(boolean leaping) {
-+        this.getHandle().setIsPouncing(leaping);
-+    }
-+
-+    @Override
-+    public boolean isLeaping() {
-+        return this.getHandle().isPouncing();
-+    }
-+
-+    @Override
-+    public void setDefending(boolean defending) {
-+        this.getHandle().setDefending(defending);
-+    }
-+
-+    @Override
-+    public boolean isDefending() {
-+        return this.getHandle().isDefending();
-+    }
-+
-+    @Override
-+    public void setFaceplanted(boolean faceplanted) {
-+        this.getHandle().setFaceplanted(faceplanted);
-+    }
-+    // Paper end - Add more fox behavior API
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java
-index 2cec61a1bb050c1ef81c5fc3d0afafe9ff29d459..97fa4e1e70203194bd939618b2fad92665af6d59 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java
-@@ -28,4 +28,17 @@ public class CraftGhast extends CraftFlying implements Ghast, CraftEnemy {
-     public void setCharging(boolean flag) {
-         this.getHandle().setCharging(flag);
-     }
-+
-+    // Paper start
-+    @Override
-+    public int getExplosionPower() {
-+        return this.getHandle().getExplosionPower();
-+    }
-+
-+    @Override
-+    public void setExplosionPower(int explosionPower) {
-+        com.google.common.base.Preconditions.checkArgument(explosionPower >= 0 && explosionPower <= 127, "The explosion power has to be between 0 and 127");
-+        this.getHandle().setExplosionPower(explosionPower);
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 1cfc3d18fb785410f5acfcf3c338776858efe25a..ea929ca51bd35447da4bdb42379dfc12ea2aae67 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -906,14 +906,29 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
- 
-     @Override
-     public boolean isInvisible() {
--        return this.getHandle().isInvisible();
-+        return super.isInvisible(); // Paper - move invisibility up to Entity - diff on change
-     }
- 
-     @Override
-     public void setInvisible(boolean invisible) {
--        this.getHandle().persistentInvisibility = invisible;
--        this.getHandle().setSharedFlag(5, invisible);
-+        super.setInvisible(invisible); // Paper - move invisibility up to Entity
-     }
-+    // Paper start
-+    @Override
-+    public float getSidewaysMovement() {
-+        return this.getHandle().xxa;
-+    }
-+
-+    @Override
-+    public float getForwardsMovement() {
-+        return this.getHandle().zza;
-+    }
-+
-+    @Override
-+    public float getUpwardsMovement() {
-+        return this.getHandle().yya;
-+    }
-+    // Paper end
- 
-     // Paper start
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-index 9986ac517e11b076a29a8c8e3f480ec286fa5825..0ad16ee7b33582d214dab41eeee378d52c8e38ed 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-@@ -58,4 +58,36 @@ public class CraftLlama extends CraftChestedHorse implements Llama, com.destroys
-     public String toString() {
-         return "CraftLlama";
-     }
-+
-+    // Paper start
-+    @Override
-+    public boolean inCaravan() {
-+        return this.getHandle().inCaravan();
-+    }
-+
-+    @Override
-+    public void joinCaravan(@org.jetbrains.annotations.NotNull Llama llama) {
-+        this.getHandle().joinCaravan(((CraftLlama) llama).getHandle());
-+    }
-+
-+    @Override
-+    public void leaveCaravan() {
-+        this.getHandle().leaveCaravan();
-+    }
-+
-+    @Override
-+    public boolean hasCaravanTail() {
-+        return this.getHandle().hasCaravanTail();
-+    }
-+
-+    @Override
-+    public Llama getCaravanHead() {
-+        return this.getHandle().getCaravanHead() == null ? null : (Llama) this.getHandle().getCaravanHead().getBukkitEntity();
-+    }
-+
-+    @Override
-+    public Llama getCaravanTail() {
-+        return this.getHandle().caravanTail == null ? null : (Llama) this.getHandle().caravanTail.getBukkitEntity();
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
-index 17f5684cba9d3ed22d9925d1951520cc4751dfe2..3a3563a1bdbc0d84d973b3a04b50b78b4bc3d379 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
-@@ -33,4 +33,20 @@ public final class CraftMinecartHopper extends CraftMinecartContainer implements
-     public void setEnabled(boolean enabled) {
-         ((MinecartHopper) this.getHandle()).setEnabled(enabled);
-     }
-+    // Paper start
-+    @Override
-+    public net.minecraft.world.entity.vehicle.MinecartHopper getHandle() {
-+        return (net.minecraft.world.entity.vehicle.MinecartHopper) super.getHandle();
-+    }
-+
-+    @Override
-+    public int getPickupCooldown() {
-+        throw new UnsupportedOperationException("Hopper minecarts don't have cooldowns");
-+    }
-+
-+    @Override
-+    public void setPickupCooldown(int cooldown) {
-+        throw new UnsupportedOperationException("Hopper minecarts don't have cooldowns");
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 60d09655c5b8b9ff289291ee6badfb5aadf8533e..fb29afb6517b009b81285adc9e6dca2eb7f74aee 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-@@ -145,4 +145,16 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
-         return getHandle().getMaxHeadXRot();
-     }
-     // Paper end
-+
-+    // Paper start
-+    @Override
-+    public boolean isAggressive() {
-+        return this.getHandle().isAggressive();
-+    }
-+
-+    @Override
-+    public void setAggressive(boolean aggressive) {
-+        this.getHandle().setAggressive(aggressive);
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPanda.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPanda.java
-index 5467e4a74b70ff57b49d9e6bc686c493178f8511..01d104d91de9e1319d27e39d3f474318c7809486 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPanda.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPanda.java
-@@ -41,6 +41,38 @@ public class CraftPanda extends CraftAnimals implements Panda {
-         this.getHandle().setHiddenGene(CraftPanda.toNms(gene));
-     }
- 
-+    // Paper start - Panda API
-+    @Override
-+    public void setSneezeTicks(int ticks) {
-+        this.getHandle().setSneezeCounter(ticks);
-+    }
-+
-+    @Override
-+    public int getSneezeTicks() {
-+        return this.getHandle().getSneezeCounter();
-+    }
-+
-+    @Override
-+    public void setEatingTicks(int ticks) {
-+        this.getHandle().setEatCounter(ticks);
-+    }
-+
-+    @Override
-+    public int getEatingTicks() {
-+        return this.getHandle().getEatCounter();
-+    }
-+
-+    @Override
-+    public void setUnhappyTicks(int ticks) {
-+        this.getHandle().setUnhappyCounter(ticks);
-+    }
-+
-+    @Override
-+    public Gene getCombinedGene() {
-+        return CraftPanda.fromNms(this.getHandle().getVariant());
-+    }
-+    // Paper end - Panda API
-+
-     @Override
-     public boolean isRolling() {
-         return this.getHandle().isRolling();
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-index 9304e201db1ec96d0916aa8ea781f3e4bc7991e6..8338effd39b1709dbe578e247710a8e58d83e3aa 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-@@ -44,5 +44,25 @@ public class CraftPhantom extends CraftFlying implements Phantom, CraftEnemy {
-     public void setShouldBurnInDay(boolean shouldBurnInDay) {
-         getHandle().setShouldBurnInDay(shouldBurnInDay);
-     }
-+
-+    @Override
-+    public org.bukkit.Location getAnchorLocation() {
-+        net.minecraft.core.BlockPos pos = this.getHandle().anchorPoint;
-+        if (pos == null) {
-+            return null;
-+        }
-+
-+        return io.papermc.paper.util.MCUtil.toLocation(this.getHandle().level(), pos);
-+    }
-+
-+    @Override
-+    public void setAnchorLocation(org.bukkit.Location location) {
-+        net.minecraft.core.BlockPos pos = null;
-+        if (location != null) {
-+            pos = io.papermc.paper.util.MCUtil.toBlockPosition(location);
-+        }
-+
-+        this.getHandle().anchorPoint = pos;
-+    }
-     // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java
-index f5ecb8c1dc92e5a4b123effd2859123b17a586d3..5124a383b60b2c8de89fa992547d0c61db760c21 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java
-@@ -84,4 +84,37 @@ public class CraftPiglin extends CraftPiglinAbstract implements Piglin, com.dest
-     public String toString() {
-         return "CraftPiglin";
-     }
-+    // Paper start
-+    @Override
-+    public void setChargingCrossbow(boolean chargingCrossbow) {
-+        this.getHandle().setChargingCrossbow(chargingCrossbow);
-+    }
-+
-+    @Override
-+    public boolean isChargingCrossbow() {
-+        return this.getHandle().isChargingCrossbow();
-+    }
-+
-+    @Override
-+    public void setDancing(boolean dancing) {
-+        if (dancing) {
-+            this.getHandle().getBrain().setMemory(net.minecraft.world.entity.ai.memory.MemoryModuleType.DANCING, true);
-+            this.getHandle().getBrain().setMemory(net.minecraft.world.entity.ai.memory.MemoryModuleType.CELEBRATE_LOCATION, this.getHandle().getOnPos());
-+        } else {
-+            this.getHandle().getBrain().eraseMemory(net.minecraft.world.entity.ai.memory.MemoryModuleType.DANCING);
-+            this.getHandle().getBrain().eraseMemory(net.minecraft.world.entity.ai.memory.MemoryModuleType.CELEBRATE_LOCATION);
-+        }
-+    }
-+
-+    @Override
-+    public void setDancing(long duration) {
-+        this.getHandle().getBrain().setMemoryWithExpiry(net.minecraft.world.entity.ai.memory.MemoryModuleType.DANCING, true, duration);
-+        this.getHandle().getBrain().setMemoryWithExpiry(net.minecraft.world.entity.ai.memory.MemoryModuleType.CELEBRATE_LOCATION, this.getHandle().getOnPos(), duration);
-+    }
-+
-+    @Override
-+    public boolean isDancing() {
-+        return this.getHandle().isDancing();
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java
-index c7aec6f28e5d3546235b30f6b1112440a76163c5..fe075cfdf3097d6cb768e71b8cc360abb8eaf367 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java
-@@ -17,4 +17,16 @@ public class CraftPolarBear extends CraftAnimals implements PolarBear {
-     public String toString() {
-         return "CraftPolarBear";
-     }
-+
-+    // Paper start
-+    @Override
-+    public boolean isStanding() {
-+        return this.getHandle().isStanding();
-+    }
-+
-+    @Override
-+    public void setStanding(boolean standing) {
-+        this.getHandle().setStanding(standing);
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java
-index 6b48b117a9cba12aae055c0ea981dfb5bc03a86e..519ef701a7d6534f7cb516f6296b95ee521f661d 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java
-@@ -29,4 +29,15 @@ public class CraftRabbit extends CraftAnimals implements Rabbit {
-     public void setRabbitType(Type type) {
-         this.getHandle().setVariant(net.minecraft.world.entity.animal.Rabbit.Variant.values()[type.ordinal()]);
-     }
-+    // Paper start
-+    @Override
-+    public void setMoreCarrotTicks(int ticks) {
-+        this.getHandle().moreCarrotTicks = ticks;
-+    }
-+
-+    @Override
-+    public int getMoreCarrotTicks() {
-+        return this.getHandle().moreCarrotTicks;
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftRavager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftRavager.java
-index cae59f77c704a5b9515dc4917ed5fdc89631ecfb..09796ce15658e3f7c223a265a547a51ee729ed40 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftRavager.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftRavager.java
-@@ -18,4 +18,35 @@ public class CraftRavager extends CraftRaider implements Ravager {
-     public String toString() {
-         return "CraftRavager";
-     }
-+    // Paper start - Missing Entity Behavior
-+    @Override
-+    public int getAttackTicks() {
-+        return this.getHandle().getAttackTick();
-+    }
-+
-+    @Override
-+    public void setAttackTicks(int ticks) {
-+        this.getHandle().attackTick = ticks;
-+    }
-+
-+    @Override
-+    public int getStunnedTicks() {
-+        return this.getHandle().getStunnedTick();
-+    }
-+
-+    @Override
-+    public void setStunnedTicks(int ticks) {
-+        this.getHandle().stunnedTick = ticks;
-+    }
-+
-+    @Override
-+    public int getRoarTicks() {
-+        return this.getHandle().getRoarTick();
-+    }
-+
-+    @Override
-+    public void setRoarTicks(int ticks) {
-+        this.getHandle().roarTick = ticks;
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSalmon.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSalmon.java
-index b8140aa25a25870259b5644091c6643da1e14b54..d4d8ce60098c74508e2de9541bf6534988779764 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSalmon.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSalmon.java
-@@ -3,7 +3,7 @@ package org.bukkit.craftbukkit.entity;
- import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.entity.Salmon;
- 
--public class CraftSalmon extends CraftFish implements Salmon {
-+public class CraftSalmon extends io.papermc.paper.entity.PaperSchoolableFish implements Salmon { // Paper - Schooling Fish API
- 
-     public CraftSalmon(CraftServer server, net.minecraft.world.entity.animal.Salmon entity) {
-         super(server, entity);
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java
-index 3f32c683ddc6999b89f2e4051eb6ae784b296b8f..dac3d34677688ac560bc1be2087a08479ef71b87 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java
-@@ -67,4 +67,17 @@ public class CraftTNTPrimed extends CraftEntity implements TNTPrimed {
-             this.getHandle().owner = null;
-         }
-     }
-+
-+    // Paper start
-+    @Override
-+    public void setBlockData(org.bukkit.block.data.BlockData data) {
-+        com.google.common.base.Preconditions.checkArgument(data != null, "The visual block data of this tnt cannot be null. To reset it just set to the TNT default block data");
-+        this.getHandle().setBlockState(((org.bukkit.craftbukkit.block.data.CraftBlockData) data).getState());
-+    }
-+
-+    @Override
-+    public org.bukkit.block.data.BlockData getBlockData() {
-+        return org.bukkit.craftbukkit.block.data.CraftBlockData.fromData(this.getHandle().getBlockState());
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTadpole.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTadpole.java
-index 451a9bfd9b9b6945e224f1bb05c7951ed934b4e3..d7c6a0bbc5671ea8f2488230c94df5146a1e98b9 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTadpole.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTadpole.java
-@@ -28,4 +28,15 @@ public class CraftTadpole extends CraftFish implements org.bukkit.entity.Tadpole
-     public void setAge(int age) {
-         this.getHandle().age = age;
-     }
-+    // Paper start
-+    @Override
-+    public void setAgeLock(boolean lock) {
-+        this.getHandle().ageLocked = lock;
-+    }
-+
-+    @Override
-+    public boolean getAgeLock() {
-+        return this.getHandle().ageLocked;
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
-index 33d6e8121755ad6cddacb4fc69e795f9831c27bd..e374b9f40eddca13b30855d25a2030f8df98138f 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
-@@ -31,4 +31,27 @@ public class CraftTrident extends CraftAbstractArrow implements Trident {
-     public String toString() {
-         return "CraftTrident";
-     }
-+
-+    // Paper start
-+    @Override
-+    public boolean hasGlint() {
-+        return this.getHandle().isFoil();
-+    }
-+
-+    @Override
-+    public void setGlint(boolean glint) {
-+        this.getHandle().setFoil(glint);
-+    }
-+
-+    @Override
-+    public int getLoyaltyLevel() {
-+        return this.getHandle().getLoyalty();
-+    }
-+
-+    @Override
-+    public void setLoyaltyLevel(int loyaltyLevel) {
-+        com.google.common.base.Preconditions.checkArgument(loyaltyLevel >= 0 && loyaltyLevel <= 127, "The loyalty level has to be between 0 and 127");
-+        this.getHandle().setLoyalty((byte) loyaltyLevel);
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTropicalFish.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTropicalFish.java
-index e3bde6d1c0e03407af1382a61748470063bb2e18..9e53c30801c700719c78c0fd521fd615c94e02c8 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTropicalFish.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTropicalFish.java
-@@ -7,7 +7,7 @@ import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.entity.TropicalFish;
- import org.bukkit.entity.TropicalFish.Pattern;
- 
--public class CraftTropicalFish extends CraftFish implements TropicalFish {
-+public class CraftTropicalFish extends io.papermc.paper.entity.PaperSchoolableFish implements TropicalFish { // Paper - Schooling Fish API
- 
-     public CraftTropicalFish(CraftServer server, net.minecraft.world.entity.animal.TropicalFish entity) {
-         super(server, entity);
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-index 1cfbe9c476f4a254edf3edf4b70696bbaba78558..e9ec3455eabc473e104b5342a615a38c1ac25a4f 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-@@ -29,6 +29,26 @@ public class CraftVex extends CraftMonster implements Vex {
-     public void setSummoner(org.bukkit.entity.Mob summoner) {
-         getHandle().setOwner(summoner == null ? null : ((CraftMob) summoner).getHandle());
-     }
-+
-+    @Override
-+    public boolean hasLimitedLifetime() {
-+        return this.getHandle().hasLimitedLife;
-+    }
-+
-+    @Override
-+    public void setLimitedLifetime(boolean hasLimitedLifetime) {
-+        this.getHandle().hasLimitedLife = hasLimitedLifetime;
-+    }
-+
-+    @Override
-+    public int getLimitedLifetimeTicks() {
-+        return this.getHandle().limitedLifeTicks;
-+    }
-+
-+    @Override
-+    public void setLimitedLifetimeTicks(int ticks) {
-+        this.getHandle().limitedLifeTicks = ticks;
-+    }
-     // Paper end
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java
-index e2a0c11867abee6add8775259c54f2052de7b1ad..3aa23d9f22d5cd22231293fd7d1ca4cb79eb7cb3 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java
-@@ -60,13 +60,20 @@ public class CraftVillagerZombie extends CraftZombie implements ZombieVillager {
- 
-     @Override
-     public void setConversionTime(int time) {
-+    // Paper start - missing entity behaviour api - converting without entity event
-+        this.setConversionTime(time, true);
-+    }
-+
-+    @Override
-+    public void setConversionTime(int time, boolean broadcastEntityEvent) {
-+    // Paper end - missing entity behaviour api - converting without entity event
-         if (time < 0) {
-             this.getHandle().villagerConversionTime = -1;
-             this.getHandle().getEntityData().set(net.minecraft.world.entity.monster.ZombieVillager.DATA_CONVERTING_ID, false);
-             this.getHandle().conversionStarter = null;
-             this.getHandle().removeEffect(MobEffects.DAMAGE_BOOST, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.CONVERSION);
-         } else {
--            this.getHandle().startConverting(null, time);
-+            this.getHandle().startConverting(null, time, broadcastEntityEvent); // Paper - missing entity behaviour api - converting without entity event
-         }
-     }
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java
-index 0e597394a3dd08f022614fc9777302fea581eb55..3cceefa0d6278924a19641a49bdf16bcdacb2233 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java
-@@ -49,5 +49,25 @@ public class CraftWanderingTrader extends CraftAbstractVillager implements Wande
-     public boolean canDrinkMilk() {
-         return getHandle().canDrinkMilk;
-     }
-+
-+    @Override
-+    public org.bukkit.Location getWanderingTowards() {
-+        net.minecraft.core.BlockPos pos = this.getHandle().getWanderTarget();
-+        if (pos == null) {
-+            return null;
-+        }
-+
-+        return io.papermc.paper.util.MCUtil.toLocation(this.getHandle().level(), pos);
-+    }
-+
-+    @Override
-+    public void setWanderingTowards(org.bukkit.Location location) {
-+        net.minecraft.core.BlockPos pos = null;
-+        if (location != null) {
-+            pos = io.papermc.paper.util.MCUtil.toBlockPosition(location);
-+        }
-+
-+        this.getHandle().setWanderTarget(pos);
-+    }
-     // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java
-index 794e4fe0a3fbd967f665b2707865c15491370c76..c284eb96a1e330078076cbe61f0f6e2ff4ed89bd 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java
-@@ -37,6 +37,13 @@ public class CraftWarden extends CraftMonster implements org.bukkit.entity.Warde
-         return this.getHandle().getAngerManagement().getActiveAnger(((CraftEntity) entity).getHandle());
-     }
- 
-+    // Paper start
-+    @Override
-+    public int getHighestAnger() {
-+        return this.getHandle().getAngerManagement().getActiveAnger(null);
-+    }
-+    // Paper end
-+
-     @Override
-     public void increaseAnger(Entity entity, int increase) {
-         Preconditions.checkArgument(entity != null, "Entity cannot be null");
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-index 1113533d281ed159bb735040fb1f913482debf3a..7a8ce6956db56061af93ba9761f5d1057a90bc49 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-@@ -67,4 +67,36 @@ public class CraftWither extends CraftMonster implements Wither, com.destroystok
- 
-         this.getHandle().setInvulnerableTicks(ticks);
-     }
-+
-+    // Paper start
-+    @Override
-+    public boolean isCharged() {
-+        return getHandle().isPowered();
-+    }
-+
-+    @Override
-+    public int getInvulnerableTicks() {
-+        return getHandle().getInvulnerableTicks();
-+    }
-+
-+    @Override
-+    public void setInvulnerableTicks(int ticks) {
-+        getHandle().setInvulnerableTicks(ticks);
-+    }
-+
-+    @Override
-+    public boolean canTravelThroughPortals() {
-+        return getHandle().canChangeDimensions();
-+    }
-+
-+    @Override
-+    public void setCanTravelThroughPortals(boolean value) {
-+        getHandle().setCanTravelThroughPortals(value);
-+    }
-+
-+    @Override
-+    public void enterInvulnerabilityPhase() {
-+        this.getHandle().makeInvulnerable();
-+    }
-+    // Paper end
- }