1 files changed, 78 insertions, 0 deletions
diff --git a/patch-remap/mache-vineflower/net/minecraft/world/entity/monster/CaveSpider.java.patch b/patch-remap/mache-vineflower/net/minecraft/world/entity/monster/CaveSpider.java.patch
new file mode 100644
index 0000000000..0bb3955f74
--- /dev/null
+++ b/patch-remap/mache-vineflower/net/minecraft/world/entity/monster/CaveSpider.java.patch
@@ -0,0 +1,78 @@
+--- a/net/minecraft/world/entity/monster/CaveSpider.java
++++ b/net/minecraft/world/entity/monster/CaveSpider.java
+@@ -8,11 +8,11 @@
+ import net.minecraft.world.effect.MobEffects;
+ import net.minecraft.world.entity.Entity;
+ import net.minecraft.world.entity.EntityDimensions;
++import net.minecraft.world.entity.EntityPose;
+ import net.minecraft.world.entity.EntityType;
++import net.minecraft.world.entity.EnumMobSpawn;
++import net.minecraft.world.entity.GroupDataEntity;
+ import net.minecraft.world.entity.LivingEntity;
+-import net.minecraft.world.entity.MobSpawnType;
+-import net.minecraft.world.entity.Pose;
+-import net.minecraft.world.entity.SpawnGroupData;
+ import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
+ import net.minecraft.world.entity.ai.attributes.Attributes;
+ import net.minecraft.world.level.Level;
+@@ -20,27 +20,29 @@
+ import org.joml.Vector3f;
+ 
+ public class CaveSpider extends Spider {
++
+     public CaveSpider(EntityType<? extends CaveSpider> entityType, Level level) {
+         super(entityType, level);
+     }
+ 
+     public static AttributeSupplier.Builder createCaveSpider() {
+-        return Spider.createAttributes().add(Attributes.MAX_HEALTH, 12.0);
++        return Spider.createAttributes().add(Attributes.MAX_HEALTH, 12.0D);
+     }
+ 
+     @Override
+     public boolean doHurtTarget(Entity entity) {
+         if (super.doHurtTarget(entity)) {
+             if (entity instanceof LivingEntity) {
+-                int i = 0;
++                byte b0 = 0;
++
+                 if (this.level().getDifficulty() == Difficulty.NORMAL) {
+-                    i = 7;
++                    b0 = 7;
+                 } else if (this.level().getDifficulty() == Difficulty.HARD) {
+-                    i = 15;
++                    b0 = 15;
+                 }
+ 
+-                if (i > 0) {
+-                    ((LivingEntity)entity).addEffect(new MobEffectInstance(MobEffects.POISON, i * 20, 0), this);
++                if (b0 > 0) {
++                    ((LivingEntity) entity).addEffect(new MobEffectInstance(MobEffects.POISON, b0 * 20, 0), this, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ATTACK); // CraftBukkit
+                 }
+             }
+ 
+@@ -52,20 +54,18 @@
+ 
+     @Nullable
+     @Override
+-    public SpawnGroupData finalizeSpawn(
+-        ServerLevelAccessor level, DifficultyInstance difficulty, MobSpawnType reason, @Nullable SpawnGroupData spawnData, @Nullable CompoundTag dataTag
+-    ) {
++    public GroupDataEntity finalizeSpawn(ServerLevelAccessor level, DifficultyInstance difficulty, EnumMobSpawn reason, @Nullable GroupDataEntity spawnData, @Nullable CompoundTag dataTag) {
+         return spawnData;
+     }
+ 
+     @Override
+-    protected float getStandingEyeHeight(Pose pose, EntityDimensions size) {
++    protected float getStandingEyeHeight(EntityPose pose, EntityDimensions size) {
+         return 0.45F;
+     }
+ 
+     @Override
+-    protected Vector3f getPassengerAttachmentPoint(Entity entity, EntityDimensions entityDimensions, float f) {
+-        return new Vector3f(0.0F, entityDimensions.height, 0.0F);
++    protected Vector3f getPassengerAttachmentPoint(Entity entity, EntityDimensions entitysize, float f) {
++        return new Vector3f(0.0F, entitysize.height, 0.0F);
+     }
+ 
+     @Override