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

and so was that

Browse Source
This commit is contained in:
Ben Kerllenevich
2021-11-24 21:52:19 -05:00
parent 3779c2abe8
commit 9b2dda7ee6
1 changed files with 102 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

204
patches/unapplied/server/0007-Configurable-entity-base-attributes.patch → patches/server/0007-Configurable-entity-base-attributes.patch
View File

@@ -5,23 +5,23 @@ 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 df7f06f8c7a1d986435bc49219c77fb349f7d1e1..0db5317b1d06ecdf0b9d199fd36fdd26e856230b 100644
index e1a0efe5437aa3709a8fb93cf1f97b262a2ad3ee..c61cc35d3f12aaf1aa7b37f5ee1d0fc7dcd6bb01 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -150,7 +150,7 @@ import org.bukkit.plugin.PluginManager;
@@ -148,7 +148,7 @@ import org.bukkit.plugin.PluginManager;
// CraftBukkit end
public abstract class Entity implements Nameable, EntityAccess, CommandSource, net.minecraft.server.KeyedObject { // Paper
public abstract class Entity implements Nameable, EntityAccess, CommandSource, io.papermc.paper.util.KeyedObject { // Paper
-
+ protected static javax.script.ScriptEngine scriptEngine = new javax.script.ScriptEngineManager().getEngineByName("rhino"); // Purpur
// CraftBukkit start
private static final int CURRENT_LEVEL = 2;
public boolean preserveMotion = true; // Paper - keep initial motion on first setPositionRotation
diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
index f0c30ab5e32e78850d402aa4bc7d42667610dbf0..8c76074289954aae933dd41184f1f0d346bc6c8b 100644
index 03adc3b746e05bb4b0514ba4a66c101b9742ceed..ec261673ac444fd5de9c8556cde5d7887098aee0 100644
--- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
+++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
@@ -29,6 +29,11 @@ public class GlowSquid extends Squid {
@@ -33,6 +33,11 @@ public class GlowSquid extends Squid {
public boolean rideableUnderWater() {
return true;
}
@@ -34,10 +34,10 @@ index f0c30ab5e32e78850d402aa4bc7d42667610dbf0..8c76074289954aae933dd41184f1f0d3
@Override
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 9b0333774621b0566a59ba53ccff88fb20e6c265..99d0403fbe40206e91687a208f790f5b4bb08cae 100644
index 0ec390a471441c094ce543c4590d3d7fa8b989a1..8780eed3ee4ba8ffb72e411d47dbd6fb3337d8d2 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 {
@@ -285,6 +285,7 @@ public abstract class LivingEntity extends Entity {
this.useItem = ItemStack.EMPTY;
this.lastClimbablePos = Optional.empty();
this.attributes = new AttributeMap(DefaultAttributes.getSupplier(type));
@@ -45,7 +45,7 @@ index 9b0333774621b0566a59ba53ccff88fb20e6c265..99d0403fbe40206e91687a208f790f5b
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 {
@@ -300,6 +301,8 @@ public abstract class LivingEntity extends Entity {
this.brain = this.makeBrain(new Dynamic(dynamicopsnbt, (net.minecraft.nbt.Tag) dynamicopsnbt.createMap((Map) ImmutableMap.of(dynamicopsnbt.createString("memories"), (net.minecraft.nbt.Tag) dynamicopsnbt.emptyMap()))));
}
@@ -55,7 +55,7 @@ index 9b0333774621b0566a59ba53ccff88fb20e6c265..99d0403fbe40206e91687a208f790f5b
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 16444d3a9f033f1a7b0de819a977b5d4c5c7bb11..cfe3e33138a6d3531aca3483e979c5df1b88895b 100644
index 4a534357889892b57cff818f4dbd000795e74e34..3e957f4f983e337219b4eed31134f08357b4cb05 100644
--- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
+++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
@@ -83,6 +83,18 @@ public class Bat extends AmbientCreature {
@@ -78,10 +78,10 @@ index 16444d3a9f033f1a7b0de819a977b5d4c5c7bb11..cfe3e33138a6d3531aca3483e979c5df
@Override
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 55ab3d403d3b01ea923923ab985c730726754e8a..a52c34dd52198d1d1af991596f84b0b9aa5f1e64 100644
index 1163bb36350097557851eaa95b0cf53da79b6a6d..b29c1c66d4bed98514aa5ae0ba52d83f579fac4a 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
@@ -209,6 +209,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -210,6 +210,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
setDeltaMovement(mot.scale(0.9D));
}
}
@@ -94,10 +94,10 @@ index 55ab3d403d3b01ea923923ab985c730726754e8a..a52c34dd52198d1d1af991596f84b0b9
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
index 48e85481372d8e6edf0460423ae488fae21ecdbf..fa2099c98ae60102ad4e555af78ab26aca587dbf 100644
index 88362a02776f481fc8c17cf8a20805e5c28fca5e..5cb689e8a22e8ba58a69acbf717baa51aeb4732c 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
@@ -139,6 +139,11 @@ public class Cat extends TamableAnimal {
@@ -140,6 +140,11 @@ public class Cat extends TamableAnimal {
setLying(false);
setRelaxStateOne(false);
}
@@ -110,7 +110,7 @@ index 48e85481372d8e6edf0460423ae488fae21ecdbf..fa2099c98ae60102ad4e555af78ab26a
public ResourceLocation getResourceLocation() {
diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
index 0b6cbbb6117bcd61081e3b136cc432058e0c5102..63790e717f11f8cc28f734f81998542164461ee2 100644
index cdb6e71f62294e48aa20a1ac0a38e208ce8e7e4c..e549add41f986f9eab68f148865a4170f732c814 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
@@ -62,6 +62,11 @@ public class Chicken extends Animal {
@@ -142,7 +142,7 @@ index ea7227ade90a713242290cadb13692f33effa5c0..f772c60ab5b4ac5468483d9765386b9b
@Override
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 5939cb25e5ce5fa5c18eb9feddf30816aac6d4c6..205b740eeb3ad2c63a3524948bdfb43a3a7c373e 100644
index ec20c082f545f350927d980c7e0b0d0b742ed791..8b9c7c2292afed5928b262dad4d825473d400880 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
@@ -50,6 +50,11 @@ public class Cow extends Animal {
@@ -158,10 +158,10 @@ index 5939cb25e5ce5fa5c18eb9feddf30816aac6d4c6..205b740eeb3ad2c63a3524948bdfb43a
@Override
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 87e128e67a147b1ff772f12317eee1ebfc91d83e..855ab63797baf825eeaddb4892cbe8430d47da0f 100644
index 827872f57914b3d8d8b8ba388a05f4c5ea49aa0e..f34e1c342562a509539f2176a91e6132cd6672b2 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
@@ -158,6 +158,11 @@ public class Dolphin extends WaterAnimal {
@@ -148,6 +148,11 @@ public class Dolphin extends WaterAnimal {
}
return false;
}
@@ -174,10 +174,10 @@ index 87e128e67a147b1ff772f12317eee1ebfc91d83e..855ab63797baf825eeaddb4892cbe843
@Nullable
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 56395fc555d05a2ff9bf551affa62521bad4893e..c8198d49ca0e159a2d87e21cf73fc901ea79310c 100644
index 61fd332a91625cc1101fde5b66c759f5e44522fc..5665ee66a3b7355a6dc65409afda42ea94449b0b 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
@@ -169,6 +169,11 @@ public class Fox extends Animal {
@@ -170,6 +170,11 @@ public class Fox extends Animal {
super.onDismount(rider);
setCanPickUpLoot(true);
}
@@ -190,7 +190,7 @@ index 56395fc555d05a2ff9bf551affa62521bad4893e..c8198d49ca0e159a2d87e21cf73fc901
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
index a5e19967b4488fb662ee2767cef5a1851da96468..8026f2a7bb5fab1762c2fb473bb8a33079df2f87 100644
index 1e8d4985998cfbe862028228bc1f5c411899ff3f..6d1c077066dfe910b56b4882fd0b5005b56b9bd2 100644
--- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
+++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
@@ -80,6 +80,11 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
@@ -206,10 +206,10 @@ index a5e19967b4488fb662ee2767cef5a1851da96468..8026f2a7bb5fab1762c2fb473bb8a330
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
index 81a393f29643a0cf3478ca8ff640c21153d1514b..b9aeb196f61582801416dab21c12d50e2e68d39e 100644
index 66e146b92348b48fd53cc2aabd5335da66f50edc..66f628a699e82d2c632dde4185a92f29b5c16312 100644
--- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
+++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
@@ -71,6 +71,11 @@ public class MushroomCow extends Cow implements Shearable {
@@ -75,6 +75,11 @@ public class MushroomCow extends Cow implements Shearable {
public boolean rideableUnderWater() {
return level.purpurConfig.mooshroomRidableInWater;
}
@@ -222,10 +222,10 @@ index 81a393f29643a0cf3478ca8ff640c21153d1514b..b9aeb196f61582801416dab21c12d50e
@Override
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 20797bc9e53d5061396ddb6a89e46b46dd2081ae..708b6fb7982dc39ee090ae9a652d48046b833323 100644
index 152cd9e2169d25e475f36a618c63aad10e878ee9..b1fb4f64ea567a96e69aa483fec5f39eecfd9a8d 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
@@ -78,6 +78,11 @@ public class Ocelot extends Animal {
@@ -79,6 +79,11 @@ public class Ocelot extends Animal {
public boolean rideableUnderWater() {
return level.purpurConfig.ocelotRidableInWater;
}
@@ -238,10 +238,10 @@ index 20797bc9e53d5061396ddb6a89e46b46dd2081ae..708b6fb7982dc39ee090ae9a652d4804
public boolean isTrusting() {
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 7ab0b39091910c492a4f860237a33996dbb08b97..68039d84c62005c7b2decde410c0578c6327b043 100644
index ce63fcbe48d3bab8a8a9e4b283fc561b30399e21..c98a143e525f55606d37e3fa14751c97e37218c0 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
@@ -127,6 +127,12 @@ public class Panda extends Animal {
@@ -126,6 +126,12 @@ public class Panda extends Animal {
eat(false);
setOnBack(false);
}
@@ -254,7 +254,7 @@ index 7ab0b39091910c492a4f860237a33996dbb08b97..68039d84c62005c7b2decde410c0578c
// Purpur end
@Override
@@ -617,7 +623,10 @@ public class Panda extends Animal {
@@ -618,7 +624,10 @@ public class Panda extends Animal {
public void setAttributes() {
if (this.isWeak()) {
@@ -267,10 +267,10 @@ index 7ab0b39091910c492a4f860237a33996dbb08b97..68039d84c62005c7b2decde410c0578c
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 3950dd170edee24f4a2effc1946e17b3b5f0c792..19caa59e11879b1269196fb0997b899e9e67b586 100644
index 8deca54f90e1ec7baa8caf59cca0c4b3e705e977..d5dfa6b9480c4314eaa53bbd95efd02e0f89a75b 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
@@ -176,6 +176,11 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
@@ -181,6 +181,11 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
setDeltaMovement(mot.scale(0.9D));
}
}
@@ -283,10 +283,10 @@ index 3950dd170edee24f4a2effc1946e17b3b5f0c792..19caa59e11879b1269196fb0997b899e
@Nullable
diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java
index 812d188cea9059f0ce5dd25b2649f30a5dfcea85..6842ed6eeeaf2785efd7518d1143c75de3240114 100644
index 0d1cfb973efb3fb472a0c57e75bad00dea769357..e2d4e9f1955fb40b43e82e4876a39560ab2e23d1 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
@@ -75,6 +75,11 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
@@ -74,6 +74,11 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
public boolean rideableUnderWater() {
return level.purpurConfig.pigRidableInWater;
}
@@ -299,10 +299,10 @@ index 812d188cea9059f0ce5dd25b2649f30a5dfcea85..6842ed6eeeaf2785efd7518d1143c75d
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
index d91852b85fc6ca7ea85886db5cad7f8d62de7174..62c76aace42a948a117aee3d209fbaac72661740 100644
index a2361524dcc9dcffe28a4c30026ac0540146c989..36f6d2b2f074eb49187a2d0badbf2bedde8a6935 100644
--- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
+++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
@@ -88,6 +88,11 @@ public class PolarBear extends Animal implements NeutralMob {
@@ -89,6 +89,11 @@ public class PolarBear extends Animal implements NeutralMob {
}
return false;
}
@@ -331,10 +331,10 @@ index bc1cf0e63c9a1df534017246687f6a13cf976ff8..654ad8cd11bc11432811ed7408c0ce9b
@Override
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 49dd8633267f7cd40cfd671ac00e627d305be32d..fd81c6ad5b7e36e013fd36d72f8db716ad9cae20 100644
index 3d8dfab5c7dfa8a506f40379aa36e6963de4e35a..845931a76d3b94ee9a1c0f238c3ea254950700bc 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
@@ -128,6 +128,11 @@ public class Rabbit extends Animal {
@@ -130,6 +130,11 @@ public class Rabbit extends Animal {
}
wasOnGround = onGround;
}
@@ -363,7 +363,7 @@ index cf88c1d95a866853568d4fa5f67850bc54127d11..e42bdde7947e532a3a5517c874411a39
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
index db547922585bc8e2aae2d7dc1bbe45a61e8da12c..e142d90d62c80c5e8b888521e4654e2b64b80990 100644
index 8922ce00b1a4acd42434fa4681c8d56a39cf9348..cfad0b694c50b3dd2b91570717992b670d18479f 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
@@ -126,6 +126,11 @@ public class Sheep extends Animal implements Shearable {
@@ -379,10 +379,10 @@ index db547922585bc8e2aae2d7dc1bbe45a61e8da12c..e142d90d62c80c5e8b888521e4654e2b
@Override
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 02efae0969dadc85cdeeea7bcfbd5dd15c8b7f89..dac6b75f6b489c880fa2093594102778b675d8ac 100644
index 2ec2d957d5db56ea0067e917e5b445d8619bb87b..5cbb66da8aacbdcec3c22610708d91af4dd87cd3 100644
--- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
@@ -63,6 +63,11 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -64,6 +64,11 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
public boolean rideableUnderWater() {
return level.purpurConfig.snowGolemRidableInWater;
}
@@ -395,10 +395,10 @@ index 02efae0969dadc85cdeeea7bcfbd5dd15c8b7f89..dac6b75f6b489c880fa2093594102778
@Override
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 09066b7e46a414b44f051ad8fdb4c734cc556db5..8f0583a32156b5dcfe0eb6351ce6a0ce341d1e13 100644
index 998f659aeff304dd481fa5e9c4b7e925d3cc019d..bb3792988864bb5fe7841c2cbdb583cb8e6fa489 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
@@ -74,6 +74,11 @@ public class Squid extends WaterAnimal {
@@ -71,6 +71,11 @@ public class Squid extends WaterAnimal {
vector.setX(cos * x - sine * z);
vector.setZ(sine * x + cos * z);
}
@@ -411,10 +411,10 @@ index 09066b7e46a414b44f051ad8fdb4c734cc556db5..8f0583a32156b5dcfe0eb6351ce6a0ce
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
index 0ddc45c8dd098b88f12a5a3af8aaa1f7dd928735..2cb3d5d7dc31ff1f23dc2ac5c189172b900c7bf1 100644
index d78947aa30e4eebca67b94614ec0e2ac9afca36d..2de2dc96b7f5960d4cef3184c14409e0868158cd 100644
--- a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
+++ b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
@@ -53,6 +53,11 @@ public class TropicalFish extends AbstractSchoolingFish {
@@ -60,6 +60,11 @@ public class TropicalFish extends AbstractSchoolingFish {
public boolean rideableUnderWater() {
return true;
}
@@ -427,10 +427,10 @@ index 0ddc45c8dd098b88f12a5a3af8aaa1f7dd928735..2cb3d5d7dc31ff1f23dc2ac5c189172b
public static String getPredefinedName(int 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 9395787aa7e406fe9585308d17437bce95f8a5a1..f2b55ebd460fbb95d3d7774cb5ea5bf2d38443b5 100644
index a318f1080a5406ec159fb2d1105b2e51ee3a8be5..a1cb8792af3bd10cc0decf230e96e87ee808fcfd 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 {
@@ -96,6 +96,11 @@ public class Turtle extends Animal {
public boolean rideableUnderWater() {
return level.purpurConfig.turtleRidableInWater;
}
@@ -443,10 +443,10 @@ index 9395787aa7e406fe9585308d17437bce95f8a5a1..f2b55ebd460fbb95d3d7774cb5ea5bf2
public void setHomePos(BlockPos pos) {
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 e66c2339633f5230ad992d19bad4f12df970d405..2c5fe1e2f4eab38e26ca8ef198f2e6bb2ab20e3c 100644
index 3240a1b0759e4d1f189ff769519b4496af0657be..da7b3b5d683a3d48bb1726981a63999724032f44 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
@@ -108,6 +108,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
@@ -114,6 +114,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
super.onMount(rider);
setInSittingPose(false);
}
@@ -459,10 +459,10 @@ index e66c2339633f5230ad992d19bad4f12df970d405..2c5fe1e2f4eab38e26ca8ef198f2e6bb
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
index b960be4d436ae42f6347f68008aa055482d5c4b2..0d32ac4e664a20583ba35e88d647c833694df9b4 100644
index fc731dc27a1f3ae61e3fb0b6d76845465eaf8ea9..3b9a9a8e591191d6f6e2fdb02634deca7331fe77 100644
--- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
@@ -105,6 +105,11 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
@@ -106,6 +106,11 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
protected void registerGoals() {
this.goalSelector.addGoal(0, new net.pl3x.purpur.entity.ai.HasRider(this)); // Purpur
}
@@ -475,10 +475,10 @@ index b960be4d436ae42f6347f68008aa055482d5c4b2..0d32ac4e664a20583ba35e88d647c833
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
index f2ba82ddb7af62fc68fbcbee0a6ded42999e15b8..38df988c5630c8c35f2468b1829591e2f27a5871 100644
index 563ead054aa41c8420d9b3f8c335dce20c229ac6..21aca411c458a1e80cdd6e97961f9a5c572854a9 100644
--- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
+++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
@@ -82,6 +82,11 @@ public class Goat extends Animal {
@@ -84,6 +84,11 @@ public class Goat extends Animal {
public boolean rideableUnderWater() {
return level.purpurConfig.goatRidableInWater;
}
@@ -491,10 +491,10 @@ index f2ba82ddb7af62fc68fbcbee0a6ded42999e15b8..38df988c5630c8c35f2468b1829591e2
@Override
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 63875471d3c4455955028594dded33293bcf8b81..44d5f629da36a88e5245e9a2cff39dd946be4ea1 100644
index 5b797d33252488bd242913b862eb599f7c8e7edc..8a34dd179eecb84ca3975fa8a0ae2e7bc2d57cee 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
@@ -124,6 +124,32 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
@@ -125,6 +125,32 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
public boolean isRidable() {
return false; // vanilla handles
}
@@ -527,7 +527,7 @@ index 63875471d3c4455955028594dded33293bcf8b81..44d5f629da36a88e5245e9a2cff39dd9
// Purpur end
@Override
@@ -1147,7 +1173,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
@@ -1149,7 +1175,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
entityData = new AgeableMob.AgeableMobGroupData(0.2F);
}
@@ -589,10 +589,10 @@ index a91152df3d443d70b1aa9aff97b3746e0331c0a6..9f7203608e15fdce1bfbaf4198387687
@Override
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 f5616cfbc9bc39a7d8bac37a92110e58ae82b2a2..6ee84f21e5dc64cbd5bdf51acd69fff09494f056 100644
index b9a7f5e536afe6409f517133db7f0d6f3b481640..a077a0ac66f7244ca895835f97edbe4c65fc5553 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
@@ -107,6 +107,21 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
@@ -108,6 +108,21 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
public boolean isSaddled() {
return super.isSaddled() || (isTamed() && getSwag() != null);
}
@@ -667,7 +667,7 @@ index a693f5ff830662e3a958af28503bd55a52130952..8bc2c6a3ee0eec08900b96eea3d0d545
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java b/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
index ff252d9ca75b90ab7606f63aa5f89b6230e33a36..c4eb99466c00c6cf1d60c7fa387f8b65efdac912 100644
index 4bad9092aa5381aa82676671482aa7ec3c091772..f651cb7a89388f23cef33d8f817cffd3c6ecea2b 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
@@ -42,6 +42,21 @@ public class TraderLlama extends Llama {
@@ -719,7 +719,7 @@ index 77d05979331af91a1fbe619d1c26fa883146add8..48b72eb4051d612648a1978b38299c0c
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
index 5df112f87fba042f13f615a22a5c6f850b779bf7..d3caa18f5de2d96eae691655dd13e83f82c61e0c 100644
index 6a39bd861f27d517f8de9fc3f589c7e20b43d706..89680ef19b511ffbc241279647412f754085db4c 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
@@ -154,6 +154,11 @@ public class EnderDragon extends Mob implements Enemy {
@@ -735,10 +735,10 @@ index 5df112f87fba042f13f615a22a5c6f850b779bf7..d3caa18f5de2d96eae691655dd13e83f
public static AttributeSupplier.Builder createAttributes() {
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 9e9b9996293acd721e183fa752b3742ffc54910f..8a4440f766ea39857c1f1ededeed18313e0f38cb 100644
index 318bf2a0feea7b5eb15b56565d4aecc4cd2eb2b4..8aa986e4fff1b74b95e59b9b2cbee1356411df7c 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
@@ -196,6 +196,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -208,6 +208,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
skull.setPosRaw(headX, headY, headZ);
level.addFreshEntity(skull);
}
@@ -750,7 +750,7 @@ index 9e9b9996293acd721e183fa752b3742ffc54910f..8a4440f766ea39857c1f1ededeed1831
// Purpur end
@Override
@@ -401,7 +406,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -412,7 +417,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
this.setInvulnerableTicks(i);
if (this.tickCount % 10 == 0) {
@@ -760,7 +760,7 @@ index 9e9b9996293acd721e183fa752b3742ffc54910f..8a4440f766ea39857c1f1ededeed1831
} else {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Blaze.java b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
index 5b3eb1ef97b2c0979e28592e0572231e3d92256d..476bcac41d569a9734aa4e97fc11e4776b454ffc 100644
index 5b49aed3f4998d7f02303da49ec3b960b6b00bd8..b1f82e0ce34081ac9d928f42d9ffbbfd507b4ca9 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Blaze.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
@@ -67,6 +67,11 @@ public class Blaze extends Monster {
@@ -792,7 +792,7 @@ index dd05c5f35d78d1385f793f4e34333ff242d136e1..45b53f11b52cc161775fcaa18567e4a7
@Override
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 9f3c6d6a33fa59cad7ffa40d63b140014b92deb2..20d9da3ddd2bc85954b9bcdab238d902238ba518 100644
index 65844015acca05df42396822446e8105b4a01287..b149deea5f9151d5d310e0b933d355e1e77ada1d 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
@@ -133,6 +133,11 @@ public class Creeper extends Monster implements PowerableMob {
@@ -808,7 +808,7 @@ index 9f3c6d6a33fa59cad7ffa40d63b140014b92deb2..20d9da3ddd2bc85954b9bcdab238d902
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
index defcc32e6b16ca7672fc01dea4738af33088c207..5c4e028d3a7620af1476f63a8ad000eb94ffb992 100644
index af235aefbcff818d39297c3fb0a90a8e8f5a5d4b..c0e1ed8c536a848c99d1a96038f627cc99c627e7 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
@@ -79,6 +79,16 @@ public class Drowned extends Zombie implements RangedAttackMob {
@@ -845,10 +845,10 @@ index 1f789b1d481234cafaa6e75c36a272bbd064482e..e25374b06e3babd93cd5bbdd58ea401a
public static AttributeSupplier.Builder createAttributes() {
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 6722fd54f447b2584e28ef34df9b3877f1b214da..cb904b7822cfe645626d3306302afe1085cddce5 100644
index 841d6846a7607c787f3ea12bc438023a832e0886..66ff0e3aa1a7dfb233a459516c4c596c1bbe033e 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -93,6 +93,11 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -98,6 +98,11 @@ public class EnderMan extends Monster implements NeutralMob {
public boolean rideableUnderWater() {
return level.purpurConfig.endermanRidableInWater;
}
@@ -877,10 +877,10 @@ index a7eb3bdb45cfefbe290fdb26bc1444eb46ee8ae6..d5c8cba1c443681e8bf81db1298ea24c
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Evoker.java b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
index 349670deed65a83e4a09e8f71edbb66bd63ff53c..9e50cf5d5b48718b1f8ff74c4de891172970ac12 100644
index 01c8ca72ff84f2beab0822247b0c44dc06b45ea0..f879bfa65b266728b570725e1ff9403f1732244d 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
@@ -56,6 +56,11 @@ public class Evoker extends SpellcasterIllager {
@@ -57,6 +57,11 @@ public class Evoker extends SpellcasterIllager {
public boolean rideableUnderWater() {
return level.purpurConfig.evokerRidableInWater;
}
@@ -893,7 +893,7 @@ index 349670deed65a83e4a09e8f71edbb66bd63ff53c..9e50cf5d5b48718b1f8ff74c4de89117
@Override
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 8f738130b33b49af84a76f89e1a6b9586adfb420..748eea45acb62cb6180bcf3409c608db2471d164 100644
index 31c3ad9c9fa42be535fd80b696c781f961e83ee1..93bd5c9fa3356d8d8575e109130fffb2fa4334c5 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
@@ -71,6 +71,11 @@ public class Ghast extends FlyingMob implements Enemy {
@@ -927,7 +927,7 @@ index d95b110a025d48e7ab18f172e455593740e45252..c67f33f2e2e0ff5c2a85782185103325
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Guardian.java b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
index e825e974c8586928dbc18c5d69071e17ccfe01c5..add17a3a1766172cfbcec9651c93cb89e020c31d 100644
index 5023a117483de9c95c861bb075f0d2e689bf6289..170b5b4e3d023950c1c0a8e5d383ab5e5e888424 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Guardian.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
@@ -87,6 +87,11 @@ public class Guardian extends Monster {
@@ -964,7 +964,7 @@ index 82a14d717e8f2ee005c2c410625b811cd016cdc3..81a3f6c1774b187be96b412dae44be62
public static boolean checkHuskSpawnRules(EntityType<Husk> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
index c03e5836a313876d856c6318b288946c4ebd1af9..23074f7dd2e670e884ac5f6386c16e853bb0144f 100644
index d879310fddd27374c18dd77dee5b594c1939fce8..dfcaad2d90abd2ce6f4a3a340ac205ce70c061e1 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
@@ -69,6 +69,13 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
@@ -1003,10 +1003,10 @@ index 95741b63d68bdf815212d718c3cc0fc689c0e4de..68abf045f0510abc45bdc2fd8c147f27
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
index fda285444538ae09cef15ecc0f68836902f3c474..5e71b3d5126d30626fbc9bd4b9eefebd20916e60 100644
index 81104c73dfb9d0a2dd962c5f450e732f27a583d8..7e0affe953585b19686bb21b31a6a2b9534aba10 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
@@ -112,6 +112,11 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -111,6 +111,11 @@ public class Phantom extends FlyingMob implements Enemy {
level.addFreshEntity(flames);
return true;
}
@@ -1019,10 +1019,10 @@ index fda285444538ae09cef15ecc0f68836902f3c474..5e71b3d5126d30626fbc9bd4b9eefebd
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Pillager.java b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
index 2137f8133f03467667296f94a26a285288e8c352..4276c33261995dba3fb71c7b700e550824fcd123 100644
index 472ca632d9d2c9b8d58925792ee99a7dccc1ab4d..466c3e33d48223f6a94c018036b992d7aa57dc6c 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Pillager.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
@@ -76,6 +76,11 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
@@ -73,6 +73,11 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
public boolean rideableUnderWater() {
return level.purpurConfig.pillagerRidableInWater;
}
@@ -1035,10 +1035,10 @@ index 2137f8133f03467667296f94a26a285288e8c352..4276c33261995dba3fb71c7b700e5508
@Override
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 23b0fe96aab0234e17c43423817c4f34c694751a..13f4b6d17312dd7379875eb56049c87c10deae88 100644
index 73a13cc8fe730ff88583d9af61ca581bd8aab99b..c1eea7e71aa364789a544e6491b2201bcb6a37c8 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
@@ -86,6 +86,11 @@ public class Ravager extends Raider {
@@ -85,6 +85,11 @@ public class Ravager extends Raider {
super.onMount(rider);
getNavigation().stop();
}
@@ -1051,7 +1051,7 @@ index 23b0fe96aab0234e17c43423817c4f34c694751a..13f4b6d17312dd7379875eb56049c87c
@Override
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 ec41c07f2f7d7c4c24b54a2fbf5cd2b73d8d1247..6a0a82498360d1721f8cdb5801552379943a76b6 100644
index 65dd85729822e3bfa2344b2d4a37e9de2913ed85..30eafae391ff5447cd9f61212798a54b026956c4 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
@@ -102,6 +102,11 @@ public class Shulker extends AbstractGolem implements Enemy {
@@ -1067,10 +1067,10 @@ index ec41c07f2f7d7c4c24b54a2fbf5cd2b73d8d1247..6a0a82498360d1721f8cdb5801552379
@Override
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 44d8ef55d47ff63589e6b47210f460a04a146291..1c523c384668b483ba0211c413ade7b87c7ca16a 100644
index e597b85a6dee0671c00d7481558cdb8419531682..3481a2e178e5c101b6038e6506933d50861c3f9d 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
@@ -49,6 +49,11 @@ public class Silverfish extends Monster {
@@ -51,6 +51,11 @@ public class Silverfish extends Monster {
public boolean rideableUnderWater() {
return level.purpurConfig.silverfishRidableInWater;
}
@@ -1099,7 +1099,7 @@ index 909a7bffcd0d7432f0714417c286fb75b6b951b9..f3d73b9cf3d3cd0d69ea2f8152a1ced4
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
index cf5e780a1708c7d72bb07da2565792fa09a87c77..7f3b89aa8bd92f821baa31b3fe47a02c43b6a3ca 100644
index 76546a356d34546099180a9c825d38c7297dec07..f8e25df1b84296962b85b09e94bc42b57588607a 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
@@ -101,6 +101,30 @@ public class Slime extends Mob implements Enemy {
@@ -1143,7 +1143,7 @@ index cf5e780a1708c7d72bb07da2565792fa09a87c77..7f3b89aa8bd92f821baa31b3fe47a02c
this.getAttribute(Attributes.ATTACK_DAMAGE).setBaseValue((double) j);
if (heal) {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Spider.java b/src/main/java/net/minecraft/world/entity/monster/Spider.java
index 62760822ef8837d20dfa7ed92a64e14574098c23..20100770115430c100ab73a341ae7f613e50f4f0 100644
index 50c4fc838eba31e5f34e71a6fbafbb366ec17d06..3f61e97cadd1c94d55093a7771b241029aee99f3 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
@@ -61,6 +61,11 @@ public class Spider extends Monster {
@@ -1175,7 +1175,7 @@ index 8480687e452b7cad0d3e434cebe17e15c59bdc40..86b1c7a1ddd33249ce3d1ff25030d421
public static boolean checkStraySpawnRules(EntityType<Stray> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java
index dcf31bc288e8371c17574a3dd4b495ea2c7a8dac..0f7383849399db1218acda986fe29ac14a36d768 100644
index f6dd5e7710ad26d843c986ce068d4b30d5586ce4..ff76fbb1618edc1aa6a58e9649e99291c90beffb 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
@@ -107,6 +107,11 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
@@ -1191,10 +1191,10 @@ index dcf31bc288e8371c17574a3dd4b495ea2c7a8dac..0f7383849399db1218acda986fe29ac1
public static boolean checkStriderSpawnRules(EntityType<Strider> type, LevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Vex.java b/src/main/java/net/minecraft/world/entity/monster/Vex.java
index 589a6f8db279c52cc7f19d7c14d08bf46ebffd7c..620b1692bda9c69ba39547b0bdcfd408a62bc5e6 100644
index 90963e11e1c75e17a38ef0b3c4918c306b0ed448..08f744680a07a877d6e235c0d9e4f108ddc46b78 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java
@@ -94,6 +94,11 @@ public class Vex extends Monster {
@@ -95,6 +95,11 @@ public class Vex extends Monster {
public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) {
return false; // no fall damage please
}
@@ -1207,7 +1207,7 @@ index 589a6f8db279c52cc7f19d7c14d08bf46ebffd7c..620b1692bda9c69ba39547b0bdcfd408
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
index cbd170cec638dfcd19c2d597e2b39bbcf38c570d..9b4a20a78f24d4b05fefbf2a7d05686ef9cc8adb 100644
index 6419deb7a712c1b2562259bc2e8e188170afac84..730fd18cd9dc334fe527283a2ba5e5259fbfead5 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
@@ -67,6 +67,11 @@ public class Vindicator extends AbstractIllager {
@@ -1223,10 +1223,10 @@ index cbd170cec638dfcd19c2d597e2b39bbcf38c570d..9b4a20a78f24d4b05fefbf2a7d05686e
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
index 0eb8010cc701014d5dd9b6c1ec167e0befcedeb9..9e0f91d4aa1c52d865e9f27ff876590740d6f650 100644
index 32c64dc093f6dcebcb903295fc71a8f95ed752b7..2eac41d27610a33adc6c2ef442cc687f0ddbdc5b 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
@@ -70,6 +70,11 @@ public class Witch extends Raider implements RangedAttackMob {
@@ -69,6 +69,11 @@ public class Witch extends Raider implements RangedAttackMob {
public boolean rideableUnderWater() {
return level.purpurConfig.witchRidableInWater;
}
@@ -1255,10 +1255,10 @@ index 570a7f7c63cae90563129dc04aeb76a0d97ffcc3..5f01beb931546a8bfc714754a65c1c9d
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
index 175ff8a67b4ac28efef112bd75508a059d6c1f50..1d5726b5ae153cb51fb0e4d343ed999335098869 100644
index 54a545836f3c318e7f90d43aca7fea8a6a56851d..fe315ebb69773d243feb2fbda369fc6ff23d93c8 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
@@ -77,6 +77,11 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
@@ -78,6 +78,11 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
public boolean rideableUnderWater() {
return level.purpurConfig.zoglinRidableInWater;
}
@@ -1271,10 +1271,10 @@ index 175ff8a67b4ac28efef112bd75508a059d6c1f50..1d5726b5ae153cb51fb0e4d343ed9993
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
index e752c877bdeef46753aab92f6484c45bc3e31ed4..dc16331adb1d02265617af9d19638d9d1a28668d 100644
index a110b65e0bf1f2e1b69343a6ac6bbfabeab22bb4..e1e669bd992f105ba7f42312ba70a39f6d044500 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -117,6 +117,11 @@ public class Zombie extends Monster {
@@ -114,6 +114,11 @@ public class Zombie extends Monster {
public boolean rideableUnderWater() {
return level.purpurConfig.zombieRidableInWater;
}
@@ -1286,7 +1286,7 @@ index e752c877bdeef46753aab92f6484c45bc3e31ed4..dc16331adb1d02265617af9d19638d9d
// Purpur end
@Override
@@ -589,7 +594,7 @@ public class Zombie extends Monster {
@@ -586,7 +591,7 @@ public class Zombie extends Monster {
}
protected void randomizeReinforcementsChance() {
@@ -1296,10 +1296,10 @@ index e752c877bdeef46753aab92f6484c45bc3e31ed4..dc16331adb1d02265617af9d19638d9d
@Override
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 d487b4cb2da18eac12ec3dc71997cdc1217a85f6..9c60e3b3e62a29d6898c82a4110ffd4d1c7cb5f2 100644
index a069a923f071991f8215bb5cf0d1c2bb4de3f344..2c93f08b0bb07b90512c317b5583d25c6ea05d82 100644
--- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
@@ -84,6 +84,16 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
@@ -85,6 +85,16 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
public boolean rideableUnderWater() {
return level.purpurConfig.zombieVillagerRidableInWater;
}
@@ -1317,10 +1317,10 @@ index d487b4cb2da18eac12ec3dc71997cdc1217a85f6..9c60e3b3e62a29d6898c82a4110ffd4d
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
index 8e5fb46d3c56a71788d02eb1865b597553c7de8e..cc5bd132bbd40aba8c910695f25a896c5f4fe635 100644
index 2dec8be9b199e9bcf0970774afbd19a4861d802f..f30b36b3f1153e1cbd9b8242909d9ba8c995df1d 100644
--- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
@@ -68,6 +68,11 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
@@ -69,6 +69,11 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
public boolean rideableUnderWater() {
return level.purpurConfig.zombifiedPiglinRidableInWater;
}
@@ -1332,7 +1332,7 @@ index 8e5fb46d3c56a71788d02eb1865b597553c7de8e..cc5bd132bbd40aba8c910695f25a896c
// Purpur end
@Override
@@ -252,7 +257,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
@@ -253,7 +258,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
@Override
protected void randomizeReinforcementsChance() {
@@ -1340,7 +1340,7 @@ index 8e5fb46d3c56a71788d02eb1865b597553c7de8e..cc5bd132bbd40aba8c910695f25a896c
+ this.getAttribute(Attributes.SPAWN_REINFORCEMENTS_CHANCE).setBaseValue(this.random.nextDouble() * this.level.purpurConfig.zombifiedPiglinSpawnReinforcements); // Purpur
}
@Override
@Nullable
diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
index 1412ab46fe66773ee8fbb717921e71934840fe9d..3ec9b8343cf80ceea8503ad78863a4b539c6ef6b 100644
--- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
@@ -1358,10 +1358,10 @@ index 1412ab46fe66773ee8fbb717921e71934840fe9d..3ec9b8343cf80ceea8503ad78863a4b5
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
index 225cb3b489c277448e891400aa9b1ffe821786ee..89a72027efd11ce261d365db037fd1b856d08184 100644
index 0edd303a5425af88b34ad6dbee5c39a5f1b73022..86a9800276648c094c688d6dbedd51657e642df5 100644
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
@@ -107,6 +107,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
@@ -106,6 +106,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
public boolean rideableUnderWater() {
return level.purpurConfig.piglinRidableInWater;
}
@@ -1390,10 +1390,10 @@ index 5025d4571a34fe9e0e58ada6b81b064716b8f672..f6734f2eb44af7b2389de5079831e0e4
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 3773bf0d3acf5362c63b54a148f88908baee0068..c19030be3e65e317c979610e3cc130ffdf183622 100644
index 787d4def6227fa64a8938e5cc291d60eeef7a3bb..0a2131d7455d7de7c9a3f9d50710da870062e714 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -170,6 +170,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -166,6 +166,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
protected void registerGoals() {
this.goalSelector.addGoal(0, new net.pl3x.purpur.entity.ai.HasRider(this));
}