More mobs

2025-08-01 12:42:05 -07:00 · 2024-12-13 20:01:24 +01:00
parent 3ef3394311
commit 0135513d3d
11 changed files with 166 additions and 199 deletions
--- a/paper-server/patches/unapplied/net/minecraft/world/entity/animal/horse/AbstractChestedHorse.java.patch
+++ b/paper-server/patches/unapplied/net/minecraft/world/entity/animal/horse/AbstractChestedHorse.java.patch
@@ -1,19 +0,0 @@
--- a/net/minecraft/world/entity/animal/horse/AbstractChestedHorse.java
-+++ b/net/minecraft/world/entity/animal/horse/AbstractChestedHorse.java
-@@ -69,9 +69,16 @@
-         super.dropEquipment(world);
-         if (this.hasChest()) {
-             this.spawnAtLocation(world, Blocks.CHEST);
-+            //this.setChest(false); // Paper - moved to post death logic
-+        }
-+    }
-+    // Paper start
-+    protected void postDeathDropItems(org.bukkit.event.entity.EntityDeathEvent event) {
-+        if (this.hasChest() && (event == null || !event.isCancelled())) {
-             this.setChest(false);
-         }
-     }
-+    // Paper end
- 
-     @Override
-     public void addAdditionalSaveData(CompoundTag nbt) {
--- a/paper-server/patches/unapplied/net/minecraft/world/entity/animal/horse/AbstractHorse.java.patch
+++ b/paper-server/patches/unapplied/net/minecraft/world/entity/animal/horse/AbstractHorse.java.patch
@@ -1,203 +0,0 @@
--- a/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-+++ b/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-@@ -79,6 +79,17 @@
- import net.minecraft.world.phys.Vec3;
- import net.minecraft.world.ticks.ContainerSingleItem;
- 
-+// CraftBukkit start
-+import java.util.Arrays;
-+import java.util.List;
-+import org.bukkit.Location;
-+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
-+import org.bukkit.craftbukkit.event.CraftEventFactory;
-+import org.bukkit.entity.HumanEntity;
-+import org.bukkit.event.entity.EntityRegainHealthEvent;
-+import org.bukkit.inventory.InventoryHolder;
-+// CraftBukkit end
-+
- public abstract class AbstractHorse extends Animal implements ContainerListener, HasCustomInventoryScreen, OwnableEntity, PlayerRideableJumping, Saddleable {
- 
-     public static final int EQUIPMENT_SLOT_OFFSET = 400;
-@@ -166,8 +177,54 @@
-         @Override
-         public boolean stillValid(Player player) {
-             return player.getVehicle() == AbstractHorse.this || player.canInteractWithEntity((Entity) AbstractHorse.this, 4.0D);
-+        }
-+
-+        // CraftBukkit start - add fields and methods
-+        public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
-+        private int maxStack = MAX_STACK;
-+
-+        @Override
-+        public List<ItemStack> getContents() {
-+            return Arrays.asList(this.getTheItem());
-+        }
-+
-+        @Override
-+        public void onOpen(CraftHumanEntity who) {
-+            this.transaction.add(who);
-+        }
-+
-+        @Override
-+        public void onClose(CraftHumanEntity who) {
-+            this.transaction.remove(who);
-+        }
-+
-+        @Override
-+        public List<HumanEntity> getViewers() {
-+            return this.transaction;
-+        }
-+
-+        @Override
-+        public int getMaxStackSize() {
-+            return this.maxStack;
-+        }
-+
-+        @Override
-+        public void setMaxStackSize(int size) {
-+            this.maxStack = size;
-+        }
-+
-+        @Override
-+        public InventoryHolder getOwner() {
-+            return (org.bukkit.entity.AbstractHorse) AbstractHorse.this.getBukkitEntity();
-+        }
-+
-+        @Override
-+        public Location getLocation() {
-+            return AbstractHorse.this.getBukkitEntity().getLocation();
-         }
-+        // CraftBukkit end
-     };
-+    public int maxDomestication = 100; // CraftBukkit - store max domestication value
- 
-     protected AbstractHorse(EntityType<? extends AbstractHorse> type, Level world) {
-         super(type, world);
-@@ -312,7 +369,7 @@
-     }
- 
-     @Override
-    public boolean isPushable() {
-+    public boolean isCollidable(boolean ignoreClimbing) { // Paper - Climbing should not bypass cramming gamerule
-         return !this.isVehicle();
-     }
- 
-@@ -366,7 +423,7 @@
-     public void createInventory() {
-         SimpleContainer inventorysubcontainer = this.inventory;
- 
-        this.inventory = new SimpleContainer(this.getInventorySize());
-+        this.inventory = new SimpleContainer(this.getInventorySize(), (org.bukkit.entity.AbstractHorse) this.getBukkitEntity()); // CraftBukkit
-         if (inventorysubcontainer != null) {
-             inventorysubcontainer.removeListener(this);
-             int i = Math.min(inventorysubcontainer.getContainerSize(), this.inventory.getContainerSize());
-@@ -470,7 +527,7 @@
-     }
- 
-     public int getMaxTemper() {
-        return 100;
-+        return this.maxDomestication; // CraftBukkit - return stored max domestication instead of 100
-     }
- 
-     @Override
-@@ -528,7 +585,7 @@
-             b0 = 5;
-             if (!this.level().isClientSide && this.isTamed() && this.getAge() == 0 && !this.isInLove()) {
-                 flag = true;
-                this.setInLove(player);
-+                this.setInLove(player, item.copy()); // Paper - Fix EntityBreedEvent copying
-             }
-         } else if (item.is(Items.GOLDEN_APPLE) || item.is(Items.ENCHANTED_GOLDEN_APPLE)) {
-             f = 10.0F;
-@@ -536,12 +593,12 @@
-             b0 = 10;
-             if (!this.level().isClientSide && this.isTamed() && this.getAge() == 0 && !this.isInLove()) {
-                 flag = true;
-                this.setInLove(player);
-+                this.setInLove(player, item.copy()); // Paper - Fix EntityBreedEvent copying
-             }
-         }
- 
-         if (this.getHealth() < this.getMaxHealth() && f > 0.0F) {
-            this.heal(f);
-+            this.heal(f, EntityRegainHealthEvent.RegainReason.EATING); // CraftBukkit
-             flag = true;
-         }
- 
-@@ -618,7 +675,7 @@
-         if (world instanceof ServerLevel worldserver) {
-             if (this.isAlive()) {
-                 if (this.random.nextInt(900) == 0 && this.deathTime == 0) {
-                    this.heal(1.0F);
-+                    this.heal(1.0F, EntityRegainHealthEvent.RegainReason.REGEN); // CraftBukkit
-                 }
- 
-                 if (this.canEatGrass()) {
-@@ -720,7 +777,16 @@
-             }
-         }
- 
-+    }
-+
-+    // 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) {
-@@ -764,6 +830,11 @@
-         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);
-@@ -883,6 +954,7 @@
-         if (this.getOwnerUUID() != null) {
-             nbt.putUUID("Owner", this.getOwnerUUID());
-         }
-+        nbt.putInt("Bukkit.MaxDomestication", this.maxDomestication); // CraftBukkit
- 
-         if (!this.inventory.getItem(0).isEmpty()) {
-             nbt.put("SaddleItem", this.inventory.getItem(0).save(this.registryAccess()));
-@@ -909,7 +981,12 @@
- 
-         if (uuid != null) {
-             this.setOwnerUUID(uuid);
-+        }
-+        // CraftBukkit start
-+        if (nbt.contains("Bukkit.MaxDomestication")) {
-+            this.maxDomestication = nbt.getInt("Bukkit.MaxDomestication");
-         }
-+        // CraftBukkit end
- 
-         if (nbt.contains("SaddleItem", 10)) {
-             ItemStack itemstack = (ItemStack) ItemStack.parse(this.registryAccess(), nbt.getCompound("SaddleItem")).orElse(ItemStack.EMPTY);
-@@ -1012,6 +1089,17 @@
- 
-     @Override
-     public void handleStartJump(int height) {
-+        // CraftBukkit start
-+        float power;
-+        if (height >= 90) {
-+            power = 1.0F;
-+        } else {
-+            power = 0.4F + 0.4F * (float) height / 90.0F;
-+        }
-+        if (!CraftEventFactory.callHorseJumpEvent(this, power)) {
-+            return;
-+        }
-+        // CraftBukkit end
-         this.allowStandSliding = true;
-         this.standIfPossible();
-         this.playJumpSound();
--- a/paper-server/patches/unapplied/net/minecraft/world/entity/animal/horse/Llama.java.patch
+++ b/paper-server/patches/unapplied/net/minecraft/world/entity/animal/horse/Llama.java.patch
@@ -1,51 +0,0 @@
--- a/net/minecraft/world/entity/animal/horse/Llama.java
-+++ b/net/minecraft/world/entity/animal/horse/Llama.java
-@@ -71,17 +71,23 @@
-     @Nullable
-     private Llama caravanHead;
-     @Nullable
-    private Llama caravanTail;
-+    public Llama caravanTail; // Paper
- 
-     public Llama(EntityType<? extends Llama> type, Level world) {
-         super(type, world);
-         this.getNavigation().setRequiredPathLength(40.0F);
-+        this.maxDomestication = 30; // Paper - Missing entity API; configure max temper instead of a hardcoded value
-     }
- 
-     public boolean isTraderLlama() {
-         return false;
-     }
- 
-+    // CraftBukkit start
-+    public void setStrengthPublic(int i) {
-+        this.setStrength(i);
-+    }
-+    // CraftBukkit end
-     private void setStrength(int strength) {
-         this.entityData.set(Llama.DATA_STRENGTH_ID, Math.max(1, Math.min(5, strength)));
-     }
-@@ -171,12 +177,12 @@
-             f = 10.0F;
-             if (this.isTamed() && this.getAge() == 0 && this.canFallInLove()) {
-                 flag = true;
-                this.setInLove(player);
-+                this.setInLove(player, item.copy()); // Paper - Fix EntityBreedEvent copying
-             }
-         }
- 
-         if (this.getHealth() < this.getMaxHealth() && f > 0.0F) {
-            this.heal(f);
-+            this.heal(f, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.EATING); // Paper - Add missing regain reason
-             flag = true;
-         }
- 
-@@ -289,7 +295,7 @@
- 
-     @Override
-     public int getMaxTemper() {
-        return 30;
-+        return super.getMaxTemper(); // Paper - Missing entity API; delegate to parent
-     }
- 
-     @Override
--- a/paper-server/patches/unapplied/net/minecraft/world/entity/animal/horse/SkeletonHorse.java.patch
+++ b/paper-server/patches/unapplied/net/minecraft/world/entity/animal/horse/SkeletonHorse.java.patch
@@ -1,21 +0,0 @@
--- a/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
-+++ b/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
-@@ -26,6 +26,9 @@
- import net.minecraft.world.entity.player.Player;
- import net.minecraft.world.level.Level;
- import net.minecraft.world.level.LevelAccessor;
-+// CraftBukkit start
-+import org.bukkit.event.entity.EntityRemoveEvent;
-+// CraftBukkit end
- 
- public class SkeletonHorse extends AbstractHorse {
- 
-@@ -122,7 +125,7 @@
-     public void aiStep() {
-         super.aiStep();
-         if (this.isTrap() && this.trapTime++ >= 18000) {
-            this.discard();
-+            this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
-         }
- 
-     }
--- a/paper-server/patches/unapplied/net/minecraft/world/entity/animal/horse/SkeletonTrapGoal.java.patch
+++ b/paper-server/patches/unapplied/net/minecraft/world/entity/animal/horse/SkeletonTrapGoal.java.patch
@@ -1,49 +0,0 @@
--- a/net/minecraft/world/entity/animal/horse/SkeletonTrapGoal.java
-+++ b/net/minecraft/world/entity/animal/horse/SkeletonTrapGoal.java
-@@ -20,6 +20,7 @@
- public class SkeletonTrapGoal extends Goal {
- 
-     private final SkeletonHorse horse;
-+    private java.util.List<org.bukkit.entity.HumanEntity> eligiblePlayers; // Paper
- 
-     public SkeletonTrapGoal(SkeletonHorse skeletonHorse) {
-         this.horse = skeletonHorse;
-@@ -27,12 +28,13 @@
- 
-     @Override
-     public boolean canUse() {
-        return this.horse.level().hasNearbyAlivePlayer(this.horse.getX(), this.horse.getY(), this.horse.getZ(), 10.0D);
-+        return !(eligiblePlayers = this.horse.level().findNearbyBukkitPlayers(this.horse.getX(), this.horse.getY(), this.horse.getZ(), 10.0D, net.minecraft.world.entity.EntitySelector.PLAYER_AFFECTS_SPAWNING)).isEmpty(); // Paper - Affects Spawning API & SkeletonHorseTrapEvent
-     }
- 
-     @Override
-     public void tick() {
-         ServerLevel worldserver = (ServerLevel) this.horse.level();
-+        if (!new com.destroystokyo.paper.event.entity.SkeletonHorseTrapEvent((org.bukkit.entity.SkeletonHorse) this.horse.getBukkitEntity(), eligiblePlayers).callEvent()) return; // Paper
-         DifficultyInstance difficultydamagescaler = worldserver.getCurrentDifficultyAt(this.horse.blockPosition());
- 
-         this.horse.setTrap(false);
-@@ -43,12 +45,12 @@
-         if (entitylightning != null) {
-             entitylightning.moveTo(this.horse.getX(), this.horse.getY(), this.horse.getZ());
-             entitylightning.setVisualOnly(true);
-            worldserver.addFreshEntity(entitylightning);
-+            worldserver.strikeLightning(entitylightning, org.bukkit.event.weather.LightningStrikeEvent.Cause.TRAP); // CraftBukkit
-             Skeleton entityskeleton = this.createSkeleton(difficultydamagescaler, this.horse);
- 
-             if (entityskeleton != null) {
-                 entityskeleton.startRiding(this.horse);
-                worldserver.addFreshEntityWithPassengers(entityskeleton);
-+                worldserver.addFreshEntityWithPassengers(entityskeleton, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.TRAP); // CraftBukkit
- 
-                 for (int i = 0; i < 3; ++i) {
-                     AbstractHorse entityhorseabstract = this.createHorse(difficultydamagescaler);
-@@ -59,7 +61,7 @@
-                         if (entityskeleton1 != null) {
-                             entityskeleton1.startRiding(entityhorseabstract);
-                             entityhorseabstract.push(this.horse.getRandom().triangle(0.0D, 1.1485D), 0.0D, this.horse.getRandom().triangle(0.0D, 1.1485D));
-                            worldserver.addFreshEntityWithPassengers(entityhorseabstract);
-+                            worldserver.addFreshEntityWithPassengers(entityhorseabstract, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.JOCKEY); // CraftBukkit
-                         }
-                     }
-                 }
--- a/paper-server/patches/unapplied/net/minecraft/world/entity/animal/horse/TraderLlama.java.patch
+++ b/paper-server/patches/unapplied/net/minecraft/world/entity/animal/horse/TraderLlama.java.patch
@@ -1,30 +0,0 @@
--- a/net/minecraft/world/entity/animal/horse/TraderLlama.java
-+++ b/net/minecraft/world/entity/animal/horse/TraderLlama.java
-@@ -21,6 +21,9 @@
- import net.minecraft.world.entity.player.Player;
- import net.minecraft.world.level.Level;
- import net.minecraft.world.level.ServerLevelAccessor;
-+// CraftBukkit start
-+import org.bukkit.event.entity.EntityRemoveEvent;
-+// CraftBukkit end
- 
- public class TraderLlama extends Llama {
- 
-@@ -94,7 +97,7 @@
-             this.despawnDelay = this.isLeashedToWanderingTrader() ? ((WanderingTrader) this.getLeashHolder()).getDespawnDelay() - 1 : this.despawnDelay - 1;
-             if (this.despawnDelay <= 0) {
-                 this.removeLeash();
-                this.discard();
-+                this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
-             }
- 
-         }
-@@ -160,7 +163,7 @@
- 
-         @Override
-         public void start() {
-            this.mob.setTarget(this.ownerLastHurtBy);
-+            this.mob.setTarget(this.ownerLastHurtBy, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_ATTACKED_OWNER, true); // CraftBukkit
-             Entity entity = this.llama.getLeashHolder();
- 
-             if (entity instanceof WanderingTrader) {