Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@e16fefb [ci skip] add 'accepted' to Done project category (#9429)
PaperMC/Paper@171ba7c Move Log4j plugins to own source set (#9428)
PaperMC/Paper@4356758 Call missing BlockDispenseEvents (#8518)
PaperMC/Paper@c0936a7 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9440)
PaperMC/Paper@12c9700 Fix ThrownEggHatchEvent#setHatching (#9448)
This commit is contained in:
granny
2023-07-05 20:32:26 -07:00
parent ab2f1c06ce
commit b21daa9622
105 changed files with 679 additions and 695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
patches/server/0009-Configurable-entity-base-attributes.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable entity base attributes
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 18f8fdc2ab2c27efcf01be3869072159e91ade4d..f54290965187661ac5ba5cc8fe90e873e71fe66d 100644
index bb3edddf4c9b2a04f6b9219be741a523e4192c0c..fb8e1f84bb57840149a95eb72f323aa729d83849 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -156,7 +156,7 @@ import org.bukkit.plugin.PluginManager;
@@ -34,10 +34,10 @@ index c6a06e07f0b4bb29b5f4c70dfa53ff6db2e4e6ea..730958dab7f074930cdccb88a89aa26e
protected ParticleOptions getInkParticle() {
return ParticleTypes.GLOW_SQUID_INK;
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 24797621de749e682bfbe8a09cb81bc2def8def8..766ee0148da5554d4c1f675af595668f2de99f60 100644
index 3c2892b9b2ade76d9d4b081ad5bce4991df11dda..0d07e666f4da002a353d03844d62a0e3aac44d9d 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -288,6 +288,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -287,6 +287,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.useItem = ItemStack.EMPTY;
this.lastClimbablePos = Optional.empty();
this.attributes = new AttributeMap(DefaultAttributes.getSupplier(type), this); // Purpur
@@ -45,7 +45,7 @@ index 24797621de749e682bfbe8a09cb81bc2def8def8..766ee0148da5554d4c1f675af595668f
this.craftAttributes = new CraftAttributeMap(this.attributes); // CraftBukkit
// CraftBukkit - setHealth(getMaxHealth()) inlined and simplified to skip the instanceof check for EntityPlayer, as getBukkitEntity() is not initialized in constructor
this.entityData.set(LivingEntity.DATA_HEALTH_ID, (float) this.getAttribute(Attributes.MAX_HEALTH).getValue());
@@ -303,6 +304,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -302,6 +303,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.brain = this.makeBrain(new Dynamic(dynamicopsnbt, (Tag) dynamicopsnbt.createMap((Map) ImmutableMap.of(dynamicopsnbt.createString("memories"), (Tag) dynamicopsnbt.emptyMap()))));
}
@@ -55,10 +55,10 @@ index 24797621de749e682bfbe8a09cb81bc2def8def8..766ee0148da5554d4c1f675af595668f
return this.brain;
}
diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
index fc240adb941cfa7db37916516b63cbfdb83f737d..42ab8b3828f66e84cf0d89169fe28867f387be6b 100644
index e184d2a89a89d4bf77a32a2d610175c5bbd38a03..c283900e6c43fda62428a6e6d8b70e512458e779 100644
--- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
+++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
@@ -278,6 +278,18 @@ public class Bat extends AmbientCreature {
@@ -264,6 +264,18 @@ public class Bat extends AmbientCreature {
}
}
@@ -78,10 +78,10 @@ index fc240adb941cfa7db37916516b63cbfdb83f737d..42ab8b3828f66e84cf0d89169fe28867
public void readAdditionalSaveData(CompoundTag nbt) {
super.readAdditionalSaveData(nbt);
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 79a2d45f10aa1afb5d1192284cd48ea026411845..aaf6f76cefc71f714bc9aeddc22149110ee76197 100644
index 706ae64b894709601dccfb621d3c215f073e98e9..e7f95639a442cf602fef0ed7aec0f5f96aa6fd92 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
@@ -466,6 +466,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -471,6 +471,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
}
}
@@ -142,10 +142,10 @@ index e2a98b45e56a368de19bb65e304370a5998c7cb9..3d61c2d5da103de68242c16d85c70381
public ItemStack getBucketItemStack() {
return new ItemStack(Items.COD_BUCKET);
diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
index 3ac30ed0a411384be5102de498815561915a7903..d26a44d634fe02e595654e573d02243b5eb66086 100644
index 11082cf272b72123d8917baa9a0d0e5367dca66b..621fe1c08dda65934437eeab679b6e5cd2d11d3d 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
@@ -58,6 +58,11 @@ public class Cow extends Animal {
@@ -59,6 +59,11 @@ public class Cow extends Animal {
}
// Purpur end
@@ -158,10 +158,10 @@ index 3ac30ed0a411384be5102de498815561915a7903..d26a44d634fe02e595654e573d02243b
protected void registerGoals() {
this.goalSelector.addGoal(0, new FloatGoal(this));
diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
index b9a2064fd3a08aa21f1a25d3f367342852185974..08e9fd3581578195e5df079b086811c5964fd17a 100644
index c268b50d43a45a5f80fd776e56484d872d494013..0ae0f8cc64578d0c51fb050b8e726e483a17e50f 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
@@ -154,6 +154,11 @@ public class Dolphin extends WaterAnimal {
@@ -158,6 +158,11 @@ public class Dolphin extends WaterAnimal {
}
// Purpur end
@@ -174,7 +174,7 @@ index b9a2064fd3a08aa21f1a25d3f367342852185974..08e9fd3581578195e5df079b086811c5
@Override
public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData, @Nullable CompoundTag entityNbt) {
diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
index c56aaf2d0460d5a4432f893300140d071a95cc38..451abd7a6d7fb0926dcebdc4504b1c9c298766e3 100644
index e0a21a0e8ff29f5b634fcb312881a1a93c6c3a44..d6370eb9af9842710052e0e497af52122f265488 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
@@ -179,6 +179,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
@@ -222,7 +222,7 @@ index 7b0e3b46e3d318ee856d53cfc5532f3432447438..780a11339d2492dd607e3ef91867ffbb
public float getWalkTargetValue(BlockPos pos, LevelReader world) {
return world.getBlockState(pos.below()).is(Blocks.MYCELIUM) ? 10.0F : world.getPathfindingCostFromLightLevels(pos);
diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
index 9f1187f5af0594da1c8450a05e0181815375c782..e67c8756455d1388069dc41e8d968800b631be4e 100644
index c25549d516072bdb362f78efce3da730e08f3ccc..20da70182312f4c30e21528add44540ea2b60e42 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
@@ -85,6 +85,11 @@ public class Ocelot extends Animal {
@@ -238,10 +238,10 @@ index 9f1187f5af0594da1c8450a05e0181815375c782..e67c8756455d1388069dc41e8d968800
return (Boolean) this.entityData.get(Ocelot.DATA_TRUSTING);
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
index 490a2b416366136c082371d39beaa65b5f6b102f..b475b278dcedef881b8612f615a057719e3466be 100644
index cc12b93b5c95202c4e3417e3a35e5f5c361b9767..81f502b19cfcfcd39f3d3b5754b6bce9c2645ccb 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
@@ -134,6 +134,12 @@ public class Panda extends Animal {
@@ -137,6 +137,12 @@ public class Panda extends Animal {
}
// Purpur end
@@ -254,7 +254,7 @@ index 490a2b416366136c082371d39beaa65b5f6b102f..b475b278dcedef881b8612f615a05771
@Override
public boolean canTakeItem(ItemStack stack) {
EquipmentSlot enumitemslot = Mob.getEquipmentSlotForItem(stack);
@@ -635,7 +641,10 @@ public class Panda extends Animal {
@@ -638,7 +644,10 @@ public class Panda extends Animal {
public void setAttributes() {
if (this.isWeak()) {
@@ -267,7 +267,7 @@ index 490a2b416366136c082371d39beaa65b5f6b102f..b475b278dcedef881b8612f615a05771
if (this.isLazy()) {
diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
index 39c5da4e037f57cca0316804d0e363c32a441c6b..361299312e883ca8377790fba5a89227e1c8b82f 100644
index dc6bc1ecb11a8d1776be488de4df7243d196f330..1e0d8d276ef5eb2cc11a1effb5808de7f8f211d5 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
@@ -191,6 +191,11 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
@@ -331,21 +331,21 @@ index 95383e246a8e1b311e4f26a66372966b6bc51de5..8b5bf8ef4481ccc829d1a39c09219415
protected void defineSynchedData() {
super.defineSynchedData();
diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
index 22188b537271d6cfd276027bb5df86404fa73ed4..db37932e56d88717a61eb8608b44c6911513aa35 100644
index df01b1c5a0f0ad34f0a49c2ac1d10d526b73da9b..8fb529fd818b2f2d28c6900d16f20e292a707293 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
@@ -137,6 +137,11 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
}
wasOnGround = onGround;
}
// Purpur end
+
+ @Override
+ public void initAttributes() {
+ this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.rabbitMaxHealth);
+ }
+
// CraftBukkit start - code from constructor
public void initializePathFinderGoals(){
this.setSpeedModifier(0.0D);
// Purpur end
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/Salmon.java b/src/main/java/net/minecraft/world/entity/animal/Salmon.java
index 87c442fb198cad8671ad1419e589a5a67c4fdca8..742805994f29a18af444912b10af631d2c60cacf 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Salmon.java
@@ -379,7 +379,7 @@ index 0e2f10fa133281477ab96ba743266ade4d5f2119..3d212b09258b9777079d4bc7ce950f52
protected void registerGoals() {
this.eatBlockGoal = new EatBlockGoal(this);
diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
index 190d123a87ef8ca84e5e0cc485a5cc65fe5ed8e8..a8b411cc3dd1f61b4f949862a077e87e26e424de 100644
index 04927f5f06d6dc14ad01319dd22583632c2c511b..3ffd9dd16c80399842ba138ed60abd66cd312dcb 100644
--- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
@@ -71,6 +71,11 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -395,10 +395,10 @@ index 190d123a87ef8ca84e5e0cc485a5cc65fe5ed8e8..a8b411cc3dd1f61b4f949862a077e87e
protected void registerGoals() {
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
index fa635fa6828c4d7e0fd80ae00cc21e5598542703..42ca9df0735b4f928fbbf1e695d1756f77be52fc 100644
index 7fa03dbc442942b70f374096e346d54089d8f0a0..913b66be2111da862e706d4978825c64cfe8b00b 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
@@ -72,6 +72,11 @@ public class Squid extends WaterAnimal {
@@ -70,6 +70,11 @@ public class Squid extends WaterAnimal {
}
// Purpur end
@@ -427,7 +427,7 @@ index 71234b258157579d3a47064e7e299bb7fb90908f..7d02e552a27632939bb9c40a62f4e0df
return "entity.minecraft.tropical_fish.predefined." + variant;
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
index e8d4fa852f22b7de191dcf26b52f19cb81967fa0..9aa764686433ad8d58191f96ab22d30154058af7 100644
index 46b71439efdab39c28d29684913bec2a1ba6491a..6ae82b6293f236fc926f411de2badc496b35399b 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
@@ -100,6 +100,11 @@ public class Turtle extends Animal {
@@ -443,10 +443,10 @@ index e8d4fa852f22b7de191dcf26b52f19cb81967fa0..9aa764686433ad8d58191f96ab22d301
this.entityData.set(Turtle.HOME_POS, pos.immutable()); // Paper - called with mutablepos...
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
index cb2b8c7cbbe882ae0ca876edaa66bea1d5cd141d..c9ad084ce93eb618261221c7e19450c06fb8a5f5 100644
index 40d647d6b3132f8273d43a1addcb8c8116c7ec19..1a27e811169a58515c796344ffa1bb3c46d1014a 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
@@ -124,6 +124,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
@@ -125,6 +125,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
}
// Purpur end
@@ -503,10 +503,10 @@ index 76a38d235de3499ca19c3ccacd9289c7355012db..5ec8815cc69f5abe03a29224650edfb1
protected SoundEvent getAmbientSound() {
return SoundEvents.CAMEL_AMBIENT;
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 b948f8ac7072afa7a60cdbb2775b0e2fa0a052e9..05405f22fa9001560eb3a6701f3bb0179a584fae 100644
index 55bc8ccc459b093ad48790932381228e24a24f14..296cc895fbd090b4d43807f4ca393f6dd853e0ce 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
@@ -157,6 +157,44 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
@@ -160,6 +160,44 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
}
// Purpur end
@@ -551,7 +551,7 @@ index b948f8ac7072afa7a60cdbb2775b0e2fa0a052e9..05405f22fa9001560eb3a6701f3bb017
@Override
protected void registerGoals() {
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HorseHasRider(this)); // Purpur
@@ -1264,7 +1302,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
@@ -1266,7 +1304,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
entityData = new AgeableMob.AgeableMobGroupData(0.2F);
}
@@ -613,7 +613,7 @@ index 3e50581033e88e8eddcbd85bfa890cbe0b88a7e6..92339f5a07dcb6bf7eb1bce6d584464e
protected void randomizeAttributes(RandomSource random) {
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue((double)generateMaxHealth(random::nextInt));
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 e05f917c462ba5bfb114e402b4f5309f421651fb..9ba0218910d7e5db9e735c50f2e60b5a1073816b 100644
index 42d5b435728aa497dc34f0ac984e8637fe96343d..967d1ff37ecc9a2cf81a1a6be8ceeb96b42ff847 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
@@ -122,6 +122,21 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
@@ -775,7 +775,7 @@ index 5a2eb6775ecb3b01fd136c796258395b4270f7a8..f160933af318becaf99befc0ecc0204b
return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 200.0D);
}
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 10da1bc9374a4178a38dd101bf173a77216101fa..6cdfde983798bdac3b10e5d17f1259bf2976b739 100644
index e1cf87e13f077860e38714a962c549dcb4644e3f..83574e3a395041341a1ba3eb59d8b360c5128b4d 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
@@ -112,6 +112,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -832,7 +832,7 @@ index 34abd8093015d7cdaf2faca2396d3950ca0a361b..2f7328286399a556f5a3862d71f2c693
public boolean doHurtTarget(Entity target) {
if (super.doHurtTarget(target)) {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
index 8782e1b1150dd23fd4a66acdab963b2af5bd4425..539f44793f11db1971e72e2bbeae8d2d9d9b6798 100644
index 5017a82ced2ea5b7a58fa54c5898b83c5746a2b9..85bf510413f88bec95e41c77b6ecdd60b14c7fb8 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
@@ -250,6 +250,11 @@ public class Creeper extends Monster implements PowerableMob {
@@ -885,10 +885,10 @@ index 16486ece9fc415d875ff94d9b806b0b5884ebc11..48c28b5177c26c8ab07bb4960a71cddb
return Guardian.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.30000001192092896D).add(Attributes.ATTACK_DAMAGE, 8.0D).add(Attributes.MAX_HEALTH, 80.0D);
}
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 c3cfa392b92b9bc7944fd28782b3b74cf15702bb..585cd908cc6f83007dc9edcd332a99664080b6d6 100644
index d88ad3f0513f9ab2ffc738b6389cf268f085ca6d..abf975d7f28832aba1fbb9d326f464d4ba3c63d2 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -109,6 +109,11 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -113,6 +113,11 @@ public class EnderMan extends Monster implements NeutralMob {
}
// Purpur end
@@ -1107,10 +1107,10 @@ index 31d204d8d81ccc30371070af3678d82dc721618d..6a6349c7002439965422aa4979682b4c
protected void registerGoals() {
super.registerGoals();
diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
index 4aa0f1a4848411a83b5d211e799c30e743b148fe..990a4ef6e2eccc228b06ba4cb3aadfce0733de5f 100644
index 3919ed8b4d91b9d58acbdd72740565352e7c52ec..1a919c29d0c601296e5c6c0bf0ebd95de55eda0a 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
@@ -88,6 +88,11 @@ public class Ravager extends Raider {
@@ -91,6 +91,11 @@ public class Ravager extends Raider {
}
// Purpur end
@@ -1123,7 +1123,7 @@ index 4aa0f1a4848411a83b5d211e799c30e743b148fe..990a4ef6e2eccc228b06ba4cb3aadfce
protected void registerGoals() {
super.registerGoals();
diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
index d4b318fc6382cd043e34db0d12d78e3561023dd5..73c1c023e2c0511bca866cfbef86a9f4fa688592 100644
index 3e5548d0489b13b4a1d5c22c9d3bf19ead87928e..7d96ba5adeddf52ed712e320d5f56a37f30e138a 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
@@ -115,6 +115,11 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
@@ -1139,10 +1139,10 @@ index d4b318fc6382cd043e34db0d12d78e3561023dd5..73c1c023e2c0511bca866cfbef86a9f4
protected void registerGoals() {
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
index 5597e4f07795287d22e0ef89051bf8ea2a27d055..0a78b3231700ff4ec4bc6ab9d3cbaebc261601e1 100644
index ebfe46a6063edf1dafef19ba570a1c0942dc87ee..5539cc692ea3ca89d7c1661a139ddf02c9076818 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
@@ -59,6 +59,11 @@ public class Silverfish extends Monster {
@@ -62,6 +62,11 @@ public class Silverfish extends Monster {
}
// Purpur end