1 files changed, 76 insertions, 0 deletions
diff --git a/patch-remap/mache-spigotflower/net/minecraft/world/entity/monster/CaveSpider.java.patch b/patch-remap/mache-spigotflower/net/minecraft/world/entity/monster/CaveSpider.java.patch
new file mode 100644
index 0000000000..439e539560
--- /dev/null
+++ b/patch-remap/mache-spigotflower/net/minecraft/world/entity/monster/CaveSpider.java.patch
@@ -0,0 +1,76 @@
+--- 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;
+@@ -21,8 +21,8 @@
+ 
+ public class CaveSpider extends Spider {
+ 
+-    public CaveSpider(EntityType<? extends CaveSpider> entitytype, Level level) {
+-        super(entitytype, level);
++    public CaveSpider(EntityType<? extends CaveSpider> entityType, Level level) {
++        super(entityType, level);
+     }
+ 
+     public static AttributeSupplier.Builder createCaveSpider() {
+@@ -30,7 +30,6 @@
+     }
+ 
+     @Override
+-    @Override
+     public boolean doHurtTarget(Entity entity) {
+         if (super.doHurtTarget(entity)) {
+             if (entity instanceof LivingEntity) {
+@@ -43,7 +42,7 @@
+                 }
+ 
+                 if (b0 > 0) {
+-                    ((LivingEntity) entity).addEffect(new MobEffectInstance(MobEffects.POISON, b0 * 20, 0), this);
++                    ((LivingEntity) entity).addEffect(new MobEffectInstance(MobEffects.POISON, b0 * 20, 0), this, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ATTACK); // CraftBukkit
+                 }
+             }
+ 
+@@ -55,25 +54,21 @@
+ 
+     @Nullable
+     @Override
+-    @Override
+-    public SpawnGroupData finalizeSpawn(ServerLevelAccessor serverlevelaccessor, DifficultyInstance difficultyinstance, MobSpawnType mobspawntype, @Nullable SpawnGroupData spawngroupdata, @Nullable CompoundTag compoundtag) {
+-        return spawngroupdata;
++    public GroupDataEntity finalizeSpawn(ServerLevelAccessor level, DifficultyInstance difficulty, EnumMobSpawn reason, @Nullable GroupDataEntity spawnData, @Nullable CompoundTag dataTag) {
++        return spawnData;
+     }
+ 
+     @Override
+-    @Override
+-    protected float getStandingEyeHeight(Pose pose, EntityDimensions entitydimensions) {
++    protected float getStandingEyeHeight(EntityPose pose, EntityDimensions size) {
+         return 0.45F;
+     }
+ 
+     @Override
+-    @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
+-    @Override
+     protected float ridingOffset(Entity entity) {
+         return entity.getBbWidth() <= this.getBbWidth() ? -0.21875F : 0.0F;
+     }