mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
fix some compile errors
This commit is contained in:
granny
File diff suppressed because it is too large
Load Diff
@@ -18,10 +18,10 @@ index ceabcb24504228f25412b8821969b8e151ecaf1b..d6ac9c9811449a651e6d13538b9efa70
|
||||
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 882ab40c8cdea8c214cb8344b3ccecddb2967c1c..cb79d2c958fbd34f8c8818e7e1c0db8887dd15ba 100644
|
||||
index 7b1ca8fd2908b8a02ec2cd1966a31e06eaa2dd1f..b86329a18dc83073462049da975dd71b9d637ab2 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
|
||||
@@ -38,6 +38,11 @@ public class GlowSquid extends Squid {
|
||||
@@ -34,6 +34,11 @@ public class GlowSquid extends Squid {
|
||||
public boolean isControllable() {
|
||||
return level.purpurConfig.glowSquidControllable;
|
||||
}
|
||||
@@ -55,7 +55,7 @@ index ff1bccf8c6a3b9adda11981b5d59bdfa82c1367a..cbbef7730e7743c05ddc8011eab77f05
|
||||
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 aad502198fd21030e79e3af6811763c1cefb9636..6677c60e7405a6f6b4f236b67616b3640cc22919 100644
|
||||
index 24733d2b967cc9d332ad8c3b8beb0c141e18ee77..f0ba6e7971090e086fd7a70a510ae91c104f0ae9 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
|
||||
@@ -93,6 +93,18 @@ public class Bat extends AmbientCreature {
|
||||
@@ -78,7 +78,7 @@ index aad502198fd21030e79e3af6811763c1cefb9636..6677c60e7405a6f6b4f236b67616b364
|
||||
|
||||
@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 d71369aa5b5fb554c565926257c82ffbec064fe3..9e1f476a9a0139b906978c3fbf14a4d847931bb2 100644
|
||||
index 605707839ca61c24d4a30e7a219875be09512ade..1ff79871121944864da0b5179bba17f97c551608 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
|
||||
@@ -214,6 +214,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
|
||||
@@ -94,7 +94,7 @@ index d71369aa5b5fb554c565926257c82ffbec064fe3..9e1f476a9a0139b906978c3fbf14a4d8
|
||||
|
||||
@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 b8dad36c9db9014cd1d5769e2543b3b033a2057e..a7fed154c677b9c7b726ed0cfac766abbd44fc54 100644
|
||||
index 516186c322114d835141ce6440df7c0232272b72..61f83ec67c68dfafbdb11ed88f02d2be526ab7f9 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
|
||||
@@ -120,6 +120,11 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
|
||||
@@ -110,7 +110,7 @@ index b8dad36c9db9014cd1d5769e2543b3b033a2057e..a7fed154c677b9c7b726ed0cfac766ab
|
||||
|
||||
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 0c2029fd614d24facd4d63762daf63e743fbf0ad..c20f1346a8cf4ee5089dc7c4fc6b3dc36e561dd0 100644
|
||||
index 526a7104ef44a7ccb24b9afada7cb602f8a8b7a9..f28e6daa41e99f1279c79e2392a76ca6f51c1b4b 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
|
||||
@@ -69,6 +69,11 @@ public class Chicken extends Animal {
|
||||
@@ -126,10 +126,10 @@ index 0c2029fd614d24facd4d63762daf63e743fbf0ad..c20f1346a8cf4ee5089dc7c4fc6b3dc3
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/Cod.java b/src/main/java/net/minecraft/world/entity/animal/Cod.java
|
||||
index 545ef4ab037b3173cc7377ad8147a44a2050d56f..861727f150f28a508d3b1c7067d410f0d696aa89 100644
|
||||
index 718b064fa3fb3d1a00f786ff839c91ce88ae4f70..47b537deac66f93a66a1df007b2bb8afac0ed079 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Cod.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Cod.java
|
||||
@@ -28,6 +28,11 @@ public class Cod extends AbstractSchoolingFish {
|
||||
@@ -23,6 +23,11 @@ public class Cod extends AbstractSchoolingFish {
|
||||
public boolean isControllable() {
|
||||
return level.purpurConfig.codControllable;
|
||||
}
|
||||
@@ -142,7 +142,7 @@ index 545ef4ab037b3173cc7377ad8147a44a2050d56f..861727f150f28a508d3b1c7067d410f0
|
||||
|
||||
@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 04356c2a3f64842582e7a637afb3f77a7920bd63..7eecdb4be5ee7de39ccb86b4bfe98491f8cba9b6 100644
|
||||
index f71ba5d1a52f7e23d23939e91049e8aa9fbd15b0..29720c0681b5c08e3a7ac5b07c6d83a1760297f1 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
|
||||
@@ -56,6 +56,11 @@ public class Cow extends Animal {
|
||||
@@ -158,10 +158,10 @@ index 04356c2a3f64842582e7a637afb3f77a7920bd63..7eecdb4be5ee7de39ccb86b4bfe98491
|
||||
|
||||
@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 7fdea349dcf3bba0fae997935b633bf70bc6ff7e..6374fbde49bd9f750f03a454b9f188ff8eded44f 100644
|
||||
index 106caca10bdd8dd546b6de24594afe236c8f7ce8..0accc5595461ce92259e3f819a9837aabd442d77 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
|
||||
@@ -157,6 +157,11 @@ public class Dolphin extends WaterAnimal {
|
||||
@@ -152,6 +152,11 @@ public class Dolphin extends WaterAnimal {
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@@ -174,7 +174,7 @@ index 7fdea349dcf3bba0fae997935b633bf70bc6ff7e..6374fbde49bd9f750f03a454b9f188ff
|
||||
|
||||
@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 3fa3f695660b51e3e2085aecbe0524bdcaa34364..4883c2a03921da28cbf2bd1978030a9dadbcda52 100644
|
||||
index 2557e8dbc13cdb3ea64781b029a0bdf1341b4e04..7a6239897d03a0502addc42853414e6d0caa42c3 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
||||
@@ -177,6 +177,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
|
||||
@@ -190,7 +190,7 @@ index 3fa3f695660b51e3e2085aecbe0524bdcaa34364..4883c2a03921da28cbf2bd1978030a9d
|
||||
|
||||
@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 fbdc53acb380f599dea2a21f5b164438787f2ae2..d73d751c1e69c22cc83a7b4d3d716833ef0bd3c2 100644
|
||||
index b78ef3626fe62d79e9edbf3279cb2cc773a6be32..5a3da8390d1b8b4e818da42578174f2016f73407 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
|
||||
@@ -84,6 +84,11 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
|
||||
@@ -206,7 +206,7 @@ index fbdc53acb380f599dea2a21f5b164438787f2ae2..d73d751c1e69c22cc83a7b4d3d716833
|
||||
|
||||
@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 38908fd222816efd8c9ae94b6947599b6c301422..19bd997d421a338966fcd3e3dfeb8669a6fb542f 100644
|
||||
index 1e9c75d9fd41c164d8853488fdbe4ed145e0f004..a63f8764ae8f0fce4e0de5799de7da3a82ceb80d 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
|
||||
@@ -78,6 +78,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
|
||||
@@ -222,7 +222,7 @@ index 38908fd222816efd8c9ae94b6947599b6c301422..19bd997d421a338966fcd3e3dfeb8669
|
||||
|
||||
@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 227a7363afed3d03226a032190d6141a8ec6e6c5..0959bcb5974cb690a08cb679ecc9b437f0a7b1ed 100644
|
||||
index 939b1e9c9eb6d364658ad5a6ade44f17443969f7..5b2996a782e8f2ad01c587aac113074c5c382da0 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
|
||||
@@ -83,6 +83,11 @@ public class Ocelot extends Animal {
|
||||
@@ -238,7 +238,7 @@ index 227a7363afed3d03226a032190d6141a8ec6e6c5..0959bcb5974cb690a08cb679ecc9b437
|
||||
|
||||
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 8125c804e51899d3cc7378354536e35dab762c87..f08bb1f0fa2f841e463a804879e42ce09818dfe9 100644
|
||||
index a4a244ecc85d478faea0b1bd17809c77a8d88830..e5156dba9cf467e73c2376ffabafc437bc9e3536 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
||||
@@ -132,6 +132,12 @@ public class Panda extends Animal {
|
||||
@@ -267,7 +267,7 @@ index 8125c804e51899d3cc7378354536e35dab762c87..f08bb1f0fa2f841e463a804879e42ce0
|
||||
|
||||
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 bff1b2aefa0d3e538d3c42d42b43ae27ac1712aa..a3fcca088601d4a7ecaf467d8742707977451387 100644
|
||||
index 23209f27c02bdd7e7a986cca03e90f03057024f3..e031a0a60253d896788cf14aaf65d4001d74d9a8 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
|
||||
@@ -189,6 +189,11 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
|
||||
@@ -283,7 +283,7 @@ index bff1b2aefa0d3e538d3c42d42b43ae27ac1712aa..a3fcca088601d4a7ecaf467d87427079
|
||||
|
||||
@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 1c89563f8e0e51bbdb41f89811eeee371a319b59..05db8fa5da085bb3843c11a70affe4c39b6dcd00 100644
|
||||
index d08e6947504f19edb0b9631c5ed78836cdc777dc..03844563434133a8fab4db4c597d35d4a745a12f 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
|
||||
@@ -79,6 +79,11 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
|
||||
@@ -299,7 +299,7 @@ index 1c89563f8e0e51bbdb41f89811eeee371a319b59..05db8fa5da085bb3843c11a70affe4c3
|
||||
|
||||
@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 a7dd2f617e51f2f9ee08c1e13a85318c826a1aec..0f3234cca23f015651c12076e7064dcd16ecb9d1 100644
|
||||
index 697562ad6259a0857fb29da71046bcb696ca2a48..e7b6e42aabe30b7804bf2d98d2b4d393621e1d7b 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
|
||||
@@ -92,6 +92,11 @@ public class PolarBear extends Animal implements NeutralMob {
|
||||
@@ -315,10 +315,10 @@ index a7dd2f617e51f2f9ee08c1e13a85318c826a1aec..0f3234cca23f015651c12076e7064dcd
|
||||
|
||||
@Nullable
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
|
||||
index b10faa0f0c831b20f3e74f127fc4420348571b91..95b839b6346617dcea6e1200d3a816c3d65f97eb 100644
|
||||
index 1190a22f03aaf7f2c3b53bdfd9afac00200f77f4..acfff1e2a54471013c3524e482d35d324d06ea6e 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
|
||||
@@ -60,6 +60,11 @@ public class Pufferfish extends AbstractFish {
|
||||
@@ -55,6 +55,11 @@ public class Pufferfish extends AbstractFish {
|
||||
public boolean isControllable() {
|
||||
return level.purpurConfig.pufferfishControllable;
|
||||
}
|
||||
@@ -331,7 +331,7 @@ index b10faa0f0c831b20f3e74f127fc4420348571b91..95b839b6346617dcea6e1200d3a816c3
|
||||
|
||||
@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 f57d19223f66a5bda2572c93bc527d08b98022e4..5aaac79bafc7f5531a6e3fe0d93a0f66dc0b315a 100644
|
||||
index 2fe90301d15895863bd7651e7f6ce52635e4e4b1..76dcd7430dbadc6b925f58b670a9eb59078b2882 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
|
||||
@@ -135,6 +135,11 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
|
||||
@@ -347,10 +347,10 @@ index f57d19223f66a5bda2572c93bc527d08b98022e4..5aaac79bafc7f5531a6e3fe0d93a0f66
|
||||
|
||||
// CraftBukkit start - code from constructor
|
||||
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 59cb21bc3166f4cc77b962c253ed786fd04090de..3873fb0e2d95973397f9a23dc363f7a65a1edfe6 100644
|
||||
index cc1e6f9d0ee241f32878ed96820f17ccb72396ba..2d525af3955a1f6dfbd21f07d813a832fd7f6c76 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Salmon.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Salmon.java
|
||||
@@ -28,6 +28,11 @@ public class Salmon extends AbstractSchoolingFish {
|
||||
@@ -23,6 +23,11 @@ public class Salmon extends AbstractSchoolingFish {
|
||||
public boolean isControllable() {
|
||||
return level.purpurConfig.salmonControllable;
|
||||
}
|
||||
@@ -363,7 +363,7 @@ index 59cb21bc3166f4cc77b962c253ed786fd04090de..3873fb0e2d95973397f9a23dc363f7a6
|
||||
|
||||
@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 75016bdd5926f02975902e57c891a851529acbbe..6c49c268aac993bc00487f03d1ad437af6a76520 100644
|
||||
index 6da1ab2aa26a1e09d20176504c2134b4cdad17b3..0b9c36f130a0ccd62bbf2418896627553bc61225 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
|
||||
@@ -131,6 +131,11 @@ public class Sheep extends Animal implements Shearable {
|
||||
@@ -379,7 +379,7 @@ index 75016bdd5926f02975902e57c891a851529acbbe..6c49c268aac993bc00487f03d1ad437a
|
||||
|
||||
@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 b61732d8da605ad5e11117bf5239ec71a674e7ee..3fd7acc96c6c5cd59668c1b5a5a09bd3d188646d 100644
|
||||
index e50847a88228d1b71d59339a633911911218f912..6f6542f57ed942de91957edf49ef8d92b5233aa8 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
|
||||
@@ -69,6 +69,11 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
|
||||
@@ -395,10 +395,10 @@ index b61732d8da605ad5e11117bf5239ec71a674e7ee..3fd7acc96c6c5cd59668c1b5a5a09bd3
|
||||
|
||||
@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 1be81262f51b51c9ed794bf83ab56fde733ff0c1..78be2f5d8f8d5267f795bfa1e9e24c4fa701ac83 100644
|
||||
index aa19d10f44aebed8fb174479b72da2a1601c2e38..0c2b930a0fc5e32afd12a4850acaaa7eb732fc01 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
|
||||
@@ -75,6 +75,11 @@ public class Squid extends WaterAnimal {
|
||||
@@ -70,6 +70,11 @@ public class Squid extends WaterAnimal {
|
||||
vector.setX(cos * x - sine * z);
|
||||
vector.setZ(sine * x + cos * z);
|
||||
}
|
||||
@@ -411,10 +411,10 @@ index 1be81262f51b51c9ed794bf83ab56fde733ff0c1..78be2f5d8f8d5267f795bfa1e9e24c4f
|
||||
|
||||
@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 7df3ee0f4b1a467d95f3eade65c0846b8a2e6337..62f44f830e5b924776d47b3ac36de4166d2e13f7 100644
|
||||
index 7c90f91685845329845a8c81f87ad9f6fdf4d973..948d86a125648300a258e08200bb90e9ba8eaf59 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
|
||||
@@ -57,6 +57,11 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
|
||||
@@ -52,6 +52,11 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
|
||||
public boolean isControllable() {
|
||||
return level.purpurConfig.tropicalFishControllable;
|
||||
}
|
||||
@@ -427,7 +427,7 @@ index 7df3ee0f4b1a467d95f3eade65c0846b8a2e6337..62f44f830e5b924776d47b3ac36de416
|
||||
|
||||
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 2217da194a63cd624d385a708d61df8816f28c7b..986e79c4129c64d328baa4202602552f8364459b 100644
|
||||
index fbfae6297769d79b87b0db63a88ce4f904d801d0..31c98011ee4521acebf8d452f135e534ffafd64c 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
|
||||
@@ -98,6 +98,11 @@ public class Turtle extends Animal {
|
||||
@@ -443,7 +443,7 @@ index 2217da194a63cd624d385a708d61df8816f28c7b..986e79c4129c64d328baa4202602552f
|
||||
|
||||
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 fa2abc7623b40728e78927b5acd07b2d5bc3509b..876e8d226068c60ebab679469483929f98e6ae7f 100644
|
||||
index c35cd3d995bac317396aedff007e9bf7e132f1a0..4713da69b3f45bfcf423726feff2800560494306 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
||||
@@ -122,6 +122,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
|
||||
@@ -459,10 +459,10 @@ index fa2abc7623b40728e78927b5acd07b2d5bc3509b..876e8d226068c60ebab679469483929f
|
||||
|
||||
@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 308361eb80889306fc137d823da628e282b7b253..c18f27a2c6076f26ff4e3fcea44beda31b93a5fc 100644
|
||||
index f30aad7e722f895b8f6966f042021fc80f470994..eaf2e6b9865a36b7c648bd1205db922a62cd7ee8 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
|
||||
@@ -118,6 +118,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
|
||||
@@ -113,6 +113,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
|
||||
protected void registerGoals() {
|
||||
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
|
||||
}
|
||||
@@ -503,7 +503,7 @@ index 37882a393d7c17a9437145ab5fe1f74370681146..40323720d9ded9e3bc5eb2f16b43bb80
|
||||
protected SoundEvent getAmbientSound() {
|
||||
return SoundEvents.CAMEL_AMBIENT;
|
||||
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 a990050212c260eae09bcd6bba397e96280c32f0..2c1c2f62780e2b6a8c8906c0a965704fe8ce1d1e 100644
|
||||
index a9805129f0aaba5f0c2751d463019844eb3b347d..44c1da8784cfeac754f5b43c1ac3bff12c4a262d 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
|
||||
@@ -104,6 +104,11 @@ public class Goat extends Animal {
|
||||
@@ -565,12 +565,12 @@ index f404bee067c7666fd4cf4818c9b093d54a43d5de..f9c8b5965c898ac57d4c8652e19c1f84
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
|
||||
index 13e03f23b1d5b120b403dda0f5002480ccc2421a..9e8af2437b06bd443db849dd3706b56871de2bf9 100644
|
||||
index 8f7cd5c3c786ff94fc9b890ec488a461b7edced0..1bf1bff1332cca89ba2df11f397473701b61fc7e 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
|
||||
@@ -20,6 +20,21 @@ public class Donkey extends AbstractChestedHorse {
|
||||
public boolean rideableUnderWater() {
|
||||
return level.purpurConfig.donkeyRidableInWater;
|
||||
public boolean dismountsUnderwater() {
|
||||
return !level.purpurConfig.donkeyRidableInWater || super.dismountsUnderwater();
|
||||
}
|
||||
+
|
||||
+ @Override
|
||||
@@ -591,12 +591,12 @@ index 13e03f23b1d5b120b403dda0f5002480ccc2421a..9e8af2437b06bd443db849dd3706b568
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
|
||||
index da91afbd553aa7745ed27dec26aba682660ef7d0..07a9cffe06fe8cbdd499b7c78e2129a3f3bc5630 100644
|
||||
index c653a3d459fd8c1c4728cd5a0e63c6b3707792d9..ac8ba7652e0ca9f940152de09dc6cac564b99a2e 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
|
||||
@@ -45,6 +45,21 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
|
||||
public boolean rideableUnderWater() {
|
||||
return level.purpurConfig.horseRidableInWater;
|
||||
public boolean dismountsUnderwater() {
|
||||
return !level.purpurConfig.horseRidableInWater || super.dismountsUnderwater();
|
||||
}
|
||||
+
|
||||
+ @Override
|
||||
@@ -617,7 +617,7 @@ index da91afbd553aa7745ed27dec26aba682660ef7d0..07a9cffe06fe8cbdd499b7c78e2129a3
|
||||
|
||||
@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 419c458f15fb421c5cd6df98b8e74391915d647d..3de18e1389559678b229a334fb98946810c3f214 100644
|
||||
index 0352e21d54ce58d0ef36df8e68ce74389daa3b5c..b9ba6f7ea3b4b436ac28a7c15b58ee31b561d644 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
|
||||
@@ -120,6 +120,21 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
|
||||
@@ -643,12 +643,12 @@ index 419c458f15fb421c5cd6df98b8e74391915d647d..3de18e1389559678b229a334fb989468
|
||||
|
||||
public boolean isTraderLlama() {
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
|
||||
index aa644005b9347b4b409756b2fd7a3587050b3ad1..da036b6913057bf4f4ce890430a8fdafb29f4b36 100644
|
||||
index cb72039e1c69e76d5d1c99f5fb63819369c2a0d6..e5f6de903d533bbef0083d270618e2a59e7096d2 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
|
||||
@@ -19,6 +19,21 @@ public class Mule extends AbstractChestedHorse {
|
||||
public boolean rideableUnderWater() {
|
||||
return level.purpurConfig.muleRidableInWater;
|
||||
public boolean dismountsUnderwater() {
|
||||
return !level.purpurConfig.muleRidableInWater || super.dismountsUnderwater();
|
||||
}
|
||||
+
|
||||
+ @Override
|
||||
@@ -695,7 +695,7 @@ index 7c891be8b94a6438910a53c0473393d49b19f5d9..e34e34a276a926c72c98bb1f9d2bacc2
|
||||
|
||||
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 c525b0bc39f90e9ada137e9e4bc3e926a9622007..aa912a52f2652dd06e309a546076e4dff6f1be7c 100644
|
||||
index 636e86c4f0c9739d1440e524c86eddce15bb3e63..540fcb9dff24208d363dcd416ad7adc3f6112776 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
|
||||
@@ -47,6 +47,21 @@ public class TraderLlama extends Llama {
|
||||
@@ -721,7 +721,7 @@ index c525b0bc39f90e9ada137e9e4bc3e926a9622007..aa912a52f2652dd06e309a546076e4df
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
|
||||
index b2f70aadf57e2f3b7f1342dbc865d519c1cf9aaa..81d738b34386ef178973c54deb4229c6089d31b7 100644
|
||||
index e9f1d53599168c4c4b44a14b445143025c4be83a..22dbda04f4cb372063410bd10a3473631acef8af 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
|
||||
@@ -31,6 +31,21 @@ public class ZombieHorse extends AbstractHorse {
|
||||
@@ -747,10 +747,10 @@ index b2f70aadf57e2f3b7f1342dbc865d519c1cf9aaa..81d738b34386ef178973c54deb4229c6
|
||||
|
||||
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 48db87ac8c8598443b2b7b3bff7bb9a7257ac16b..ed69b63610bc4214367c793795e5e7aae548ae6f 100644
|
||||
index d4561ddfd79e80414ce006d54b90a45345017378..09ed5144c448f7620b5c856a9fa12da07ec0cce6 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
|
||||
@@ -162,6 +162,11 @@ public class EnderDragon extends Mob implements Enemy {
|
||||
@@ -161,6 +161,11 @@ public class EnderDragon extends Mob implements Enemy {
|
||||
public double getMaxY() {
|
||||
return level.purpurConfig.enderDragonMaxY;
|
||||
}
|
||||
@@ -763,7 +763,7 @@ index 48db87ac8c8598443b2b7b3bff7bb9a7257ac16b..ed69b63610bc4214367c793795e5e7aa
|
||||
|
||||
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 53422cbd694f6986584f75b3f7d9c6b9c09af34a..d28fbdf87eacd948a76db49736208b57ee0692b0 100644
|
||||
index da20eee9d210cd13dc47dea7294043d61a78f41d..33ce9424b8b60d5673ebabe9e62ca03ac84190b8 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
|
||||
@@ -224,6 +224,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
|
||||
@@ -788,7 +788,7 @@ index 53422cbd694f6986584f75b3f7d9c6b9c09af34a..d28fbdf87eacd948a76db49736208b57
|
||||
|
||||
} 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 7e5b28368fbfdd2844656f6d2eedf54ce1004670..1b114ddc9872576a19d8f9e6424fa9c99c207a9d 100644
|
||||
index 9fc8bc954be035ec75fce21f4317330b64ae66a0..ae291e741f283d2e56f55512608f5852ef266ccd 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Blaze.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
|
||||
@@ -72,6 +72,11 @@ public class Blaze extends Monster {
|
||||
@@ -804,7 +804,7 @@ index 7e5b28368fbfdd2844656f6d2eedf54ce1004670..1b114ddc9872576a19d8f9e6424fa9c9
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
|
||||
index 790d4abbc8e0b288e20e72e63f8190e938e2fecb..b9ee6fdaad09c92fdeea2e5be606818278a77c21 100644
|
||||
index 342da1b83b5c00fb99bd7dedaccf986de0a8cad2..90dc6df729e72c7925ed2c3d36debb92989b2646 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
|
||||
@@ -43,6 +43,11 @@ public class CaveSpider extends Spider {
|
||||
@@ -820,7 +820,7 @@ index 790d4abbc8e0b288e20e72e63f8190e938e2fecb..b9ee6fdaad09c92fdeea2e5be6068182
|
||||
|
||||
@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 ad1ba865a501f4b0434493052ed2e11bdbca29c5..97164b0d799d768a48741075bdf154e1a0478f13 100644
|
||||
index 45ba62391e2732377c3b92202773ec5d32cc59c4..b128c8bf3c655464d0c279f32eb9a1968fcccc71 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
|
||||
@@ -137,6 +137,11 @@ public class Creeper extends Monster implements PowerableMob {
|
||||
@@ -836,7 +836,7 @@ index ad1ba865a501f4b0434493052ed2e11bdbca29c5..97164b0d799d768a48741075bdf154e1
|
||||
|
||||
@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 fe9b8d2ef2befccead7e8c085ecfd47bbed884b2..0d246aabc114145c349ac251364856530672c9e3 100644
|
||||
index d59a28657f3d776ae54528287dff80e88ec17db3..edfc149ef228954fe0900439c8bf25f4249b28e2 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
|
||||
@@ -83,6 +83,16 @@ public class Drowned extends Zombie implements RangedAttackMob {
|
||||
@@ -857,10 +857,10 @@ index fe9b8d2ef2befccead7e8c085ecfd47bbed884b2..0d246aabc114145c349ac25136485653
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
|
||||
index 82b03488178962eb74fe252d561ba8cee32eda95..01be40f1740fc689b101fc596dbbb1e66de0bfb1 100644
|
||||
index 4fbae6e88daaabfce22bb9d6e60e02a109e5178a..84bac517860c565d26dfa31ee06fac5c41aa035e 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
|
||||
@@ -48,6 +48,11 @@ public class ElderGuardian extends Guardian {
|
||||
@@ -43,6 +43,11 @@ public class ElderGuardian extends Guardian {
|
||||
public boolean isControllable() {
|
||||
return level.purpurConfig.elderGuardianControllable;
|
||||
}
|
||||
@@ -873,7 +873,7 @@ index 82b03488178962eb74fe252d561ba8cee32eda95..01be40f1740fc689b101fc596dbbb1e6
|
||||
|
||||
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 f09c04813cd911d583c727457075fd2695861b59..94bfabd8d7b4e860a99518b390ad2b7b5ef02070 100644
|
||||
index 9c5b2a694ba3d29669fb6855e72090e7912e842d..6e93faa6debeba159664401a49ddd5ca159abf80 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
|
||||
@@ -107,6 +107,11 @@ public class EnderMan extends Monster implements NeutralMob {
|
||||
@@ -889,7 +889,7 @@ index f09c04813cd911d583c727457075fd2695861b59..94bfabd8d7b4e860a99518b390ad2b7b
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/Endermite.java b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
|
||||
index 9af512ac1147c7be9afeb2e1b767f3455d366b79..400045d30353899edc89907deab14943bc5c37eb 100644
|
||||
index a83131974a1ce9d24003534767c330eefbac5c96..294eb415d57cf28489d8cfd3d3a9102b9bbe9e9a 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
|
||||
@@ -52,6 +52,11 @@ public class Endermite extends Monster {
|
||||
@@ -905,7 +905,7 @@ index 9af512ac1147c7be9afeb2e1b767f3455d366b79..400045d30353899edc89907deab14943
|
||||
|
||||
@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 4321d594e3fc392ab7f2cdb36bc0a824c8ca4adc..6c3ca27b03e98771aed8710b09a9caf493de4dcf 100644
|
||||
index cc1f8cd24a360937ce26d39868053f26bbae198f..d0342c28f028a26536ef8e42302ea310a6064a18 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
|
||||
@@ -63,6 +63,11 @@ public class Evoker extends SpellcasterIllager {
|
||||
@@ -921,7 +921,7 @@ index 4321d594e3fc392ab7f2cdb36bc0a824c8ca4adc..6c3ca27b03e98771aed8710b09a9caf4
|
||||
|
||||
@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 612ef4aa63b6076a69bfd830282394c49bff205a..3cb9b399db596b90d7885e2003ba41f4f79a3588 100644
|
||||
index 5f6abfe412f205b13ec6ac249d97a6e7bbc87809..b21d8d069caffe9c7a6f5a856fb91d5c5b60567e 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
|
||||
@@ -76,6 +76,11 @@ public class Ghast extends FlyingMob implements Enemy {
|
||||
@@ -937,7 +937,7 @@ index 612ef4aa63b6076a69bfd830282394c49bff205a..3cb9b399db596b90d7885e2003ba41f4
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java
|
||||
index e310f4c451d751f4ce03562c9e3db3be313fa7db..8b1942b396606f0c989645a6ac587fbdd26a3dc5 100644
|
||||
index 4e21b0eb57cde5d5cea59b1971367de25a4118e0..a57299a152eb05d49fed58eda6aaa29c0b5f1362 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Giant.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java
|
||||
@@ -35,6 +35,13 @@ public class Giant extends Monster {
|
||||
@@ -955,10 +955,10 @@ index e310f4c451d751f4ce03562c9e3db3be313fa7db..8b1942b396606f0c989645a6ac587fbd
|
||||
|
||||
@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 15cfb26d9fe41b4570d19ada5970bb636d091532..2a71d5ac30c7bd57365002549f591c17bfb67d0e 100644
|
||||
index ba03f3e524b9ba8e8767b9e3133e96782b5d4267..4292174f1f6c77374aecf74f1ed81929ed5c9249 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Guardian.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
|
||||
@@ -94,6 +94,11 @@ public class Guardian extends Monster {
|
||||
@@ -89,6 +89,11 @@ public class Guardian extends Monster {
|
||||
public boolean isControllable() {
|
||||
return level.purpurConfig.guardianControllable;
|
||||
}
|
||||
@@ -971,7 +971,7 @@ index 15cfb26d9fe41b4570d19ada5970bb636d091532..2a71d5ac30c7bd57365002549f591c17
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/Husk.java b/src/main/java/net/minecraft/world/entity/monster/Husk.java
|
||||
index 87e77fe01c9ffbbc6bcc2f8d4c10545481155bf0..e41cc68649c79dd4ce7455f36112e8347e7c84e6 100644
|
||||
index 22b5748f86f8f51204ce59bf9cd6282aaadae767..80bb77199791a312216e8366275e5b0e1c8b14fa 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Husk.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Husk.java
|
||||
@@ -37,6 +37,16 @@ public class Husk extends Zombie {
|
||||
@@ -992,7 +992,7 @@ index 87e77fe01c9ffbbc6bcc2f8d4c10545481155bf0..e41cc68649c79dd4ce7455f36112e834
|
||||
|
||||
public static boolean checkHuskSpawnRules(EntityType<Husk> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource 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 86c629e15d04d1fa0cb3349c6abf5bc09fa6fd34..01d7e41951d765bac9286adcf3f3196b954f8ff6 100644
|
||||
index 590313ec852cac17ab6cc27337d42ed9b30662fe..a9c0989d23a11ea9273712aa0e98bf275376abef 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
|
||||
@@ -74,6 +74,13 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
|
||||
@@ -1010,7 +1010,7 @@ index 86c629e15d04d1fa0cb3349c6abf5bc09fa6fd34..01d7e41951d765bac9286adcf3f3196b
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
|
||||
index 09d44964b444743057d0aba26c9cb9f001969e16..01420d5dc03e67443291983f3c6e58340a44a37f 100644
|
||||
index 106e01b931f5b04269b280bbb82a732caaba9259..9e73c3c79fcbbb17015f00cf300de3e5447c3c29 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
|
||||
@@ -45,6 +45,26 @@ public class MagmaCube extends Slime {
|
||||
@@ -1041,7 +1041,7 @@ index 09d44964b444743057d0aba26c9cb9f001969e16..01420d5dc03e67443291983f3c6e5834
|
||||
|
||||
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 4aa535e990cc1344e35cdfa6adb78b77b3e0b48a..5ee85ed1f5ae3d50c17591ffa92d79b218454b7d 100644
|
||||
index fd9c107bbaea0daea1882f3715956c28448580b8..cabe7101fc6e43ece67f7e4f647dd2eef1255c60 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
|
||||
@@ -116,6 +116,21 @@ public class Phantom extends FlyingMob implements Enemy {
|
||||
@@ -1079,7 +1079,7 @@ index 4aa535e990cc1344e35cdfa6adb78b77b3e0b48a..5ee85ed1f5ae3d50c17591ffa92d79b2
|
||||
|
||||
public int getPhantomSize() {
|
||||
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 a12352cb50edd8bd7a8f514e714e352bb341c2f7..f2f0137d8c74165f5ea829599f537c1425e4c872 100644
|
||||
index 6fc3af5989a41f3e0f18ae14453fcd8388ea940a..f1eb424f1c4c15f777350603543bdf6613c97019 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Pillager.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
|
||||
@@ -77,6 +77,11 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
|
||||
@@ -1095,7 +1095,7 @@ index a12352cb50edd8bd7a8f514e714e352bb341c2f7..f2f0137d8c74165f5ea829599f537c14
|
||||
|
||||
@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 3912277fd92971268e96a15c7003809ae4899a9a..b782b39a0efa651104537d0f422685128708aa7e 100644
|
||||
index a345d9a16831257d06f0b6ae43d2aa50a1adfc91..2a176517488bbe0804deaf3948dcfe7eee9e9089 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 {
|
||||
@@ -1111,7 +1111,7 @@ index 3912277fd92971268e96a15c7003809ae4899a9a..b782b39a0efa651104537d0f42268512
|
||||
|
||||
@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 f8e09c2fa07e5682b341a652d2a0a50e748a4841..278e4d22e0a8fd7ff27df175fe46e11b3ec15534 100644
|
||||
index 46edc9ea9b5cd352d87996937aeb076f93114907..8276c8cb76f36e99ec09c0cede5aeac90dfd11fb 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
|
||||
@@ -110,6 +110,11 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
|
||||
@@ -1127,7 +1127,7 @@ index f8e09c2fa07e5682b341a652d2a0a50e748a4841..278e4d22e0a8fd7ff27df175fe46e11b
|
||||
|
||||
@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 3aa80d7c6b0bc4e8de0581adcd6b05518957e633..26a24da890f451ffba664dbcdbc97ec4870db0ee 100644
|
||||
index 589c19f5d512c2256b1ddfe306f6b0cbeb6e850b..8efc8d6e05da041efb61776ac0b5363f31f8bb4f 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
|
||||
@@ -57,6 +57,11 @@ public class Silverfish extends Monster {
|
||||
@@ -1143,7 +1143,7 @@ index 3aa80d7c6b0bc4e8de0581adcd6b05518957e633..26a24da890f451ffba664dbcdbc97ec4
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
|
||||
index 84d03d11d24e6c36a91be7a8e310e91a002370fe..6fb4649b5a0c87ef6906902ce533b24573e6fcde 100644
|
||||
index c871416d5ec80a41034c14dce4e8c839b3091e3e..46caa30dec30b62add4cdb41932f3268c07dac67 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
|
||||
@@ -41,6 +41,11 @@ public class Skeleton extends AbstractSkeleton {
|
||||
@@ -1159,7 +1159,7 @@ index 84d03d11d24e6c36a91be7a8e310e91a002370fe..6fb4649b5a0c87ef6906902ce533b245
|
||||
|
||||
@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 3e4777e5f3ad19933d9eaffd5e4bc9d4d13120f0..344386b3da76778f2758c4778e76755056e19501 100644
|
||||
index 19e1c0bd1516732826672642e54dc0813d413f10..e99f6f6e4aa490eeaa95892ea61c972ca159425e 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
|
||||
@@ -104,6 +104,37 @@ public class Slime extends Mob implements Enemy {
|
||||
@@ -1213,7 +1213,7 @@ index 3e4777e5f3ad19933d9eaffd5e4bc9d4d13120f0..344386b3da76778f2758c4778e767550
|
||||
this.setHealth(this.getMaxHealth());
|
||||
}
|
||||
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 59ad80708077dd75212d4ad5d94afb2cd1ec5483..669a0ee7661e972a169d8b550af1e5658c029474 100644
|
||||
index 0e8d114813da3c47021ad32c45cac23217dfbc4c..e3d3690bb8cec0c610da7ddf781ebff165de418f 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
|
||||
@@ -66,6 +66,11 @@ public class Spider extends Monster {
|
||||
@@ -1229,7 +1229,7 @@ index 59ad80708077dd75212d4ad5d94afb2cd1ec5483..669a0ee7661e972a169d8b550af1e565
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/Stray.java b/src/main/java/net/minecraft/world/entity/monster/Stray.java
|
||||
index 5737b1b2c2882e67082e2c0243b192ac1d50f8b7..e7f0807cc4e57c99bbd0debaebb3b9f6243c591c 100644
|
||||
index 4c81ea7cea571d8e4afb07c2bc84d1d1a8b33f3f..a0247b8e29aad13c2c6f90f686664cfae99c6acd 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Stray.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Stray.java
|
||||
@@ -36,6 +36,11 @@ public class Stray extends AbstractSkeleton {
|
||||
@@ -1245,7 +1245,7 @@ index 5737b1b2c2882e67082e2c0243b192ac1d50f8b7..e7f0807cc4e57c99bbd0debaebb3b9f6
|
||||
|
||||
public static boolean checkStraySpawnRules(EntityType<Stray> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource 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 482a1ca619e942782da5ed0b7f60255cb3f18f2a..5fb06339822ec90db669a282c42fe1c25b0bc1f0 100644
|
||||
index 486111443d2557dde8c75aef6855bc749c2487de..b512ac4b75e53c272a3c41fb5b66c84b6b0e9847 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
|
||||
@@ -115,6 +115,11 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
|
||||
@@ -1261,7 +1261,7 @@ index 482a1ca619e942782da5ed0b7f60255cb3f18f2a..5fb06339822ec90db669a282c42fe1c2
|
||||
|
||||
public static boolean checkStriderSpawnRules(EntityType<Strider> type, LevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource 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 e14af9c332fdaf6af5cc07df6cc6176e680d4c89..5b5dd53181b18ad7c4af7f9381fd985dd54d2370 100644
|
||||
index ee3143d24914a14ec5f15785d303aec0846727e3..cd2670bcffbf8c790d128ed312855a835cb70749 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java
|
||||
@@ -105,6 +105,11 @@ public class Vex extends Monster implements TraceableEntity {
|
||||
@@ -1277,7 +1277,7 @@ index e14af9c332fdaf6af5cc07df6cc6176e680d4c89..5b5dd53181b18ad7c4af7f9381fd985d
|
||||
|
||||
@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 c0421de54b2d192d67c54cef359f6b12d2d013c1..c3b8bce2d8e1dccb619267923964e06abfed8762 100644
|
||||
index 0f547bffc269416b5e0b74b7c448cde44a662edc..32c7836fcceaeee018dd965f77ac1d2c2ab45ea0 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
|
||||
@@ -73,6 +73,11 @@ public class Vindicator extends AbstractIllager {
|
||||
@@ -1293,7 +1293,7 @@ index c0421de54b2d192d67c54cef359f6b12d2d013c1..c3b8bce2d8e1dccb619267923964e06a
|
||||
|
||||
@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 4851c9af562a9e2f019e35c7b55a4b984ce2b132..dbfb46cc45d96b32f67869c796970c4c0e93202a 100644
|
||||
index 8c289269dbfe346089e4264f5fbcdf06860414cc..cf64f00c7a1528006d4946ad5d871cf487336745 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
|
||||
@@ -72,6 +72,11 @@ public class Witch extends Raider implements RangedAttackMob {
|
||||
@@ -1309,7 +1309,7 @@ index 4851c9af562a9e2f019e35c7b55a4b984ce2b132..dbfb46cc45d96b32f67869c796970c4c
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
|
||||
index 3b272b5653c6e7672f16eb35314c689910c14250..b374069a1e88db67a56d6d5f9e05318c0403d462 100644
|
||||
index 7776a9cfdcb19a3baf82bc8d75e39a4fbea6a00b..259896608f947b1dd574192e5e4babce4bd7d7ff 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
|
||||
@@ -50,6 +50,11 @@ public class WitherSkeleton extends AbstractSkeleton {
|
||||
@@ -1325,7 +1325,7 @@ index 3b272b5653c6e7672f16eb35314c689910c14250..b374069a1e88db67a56d6d5f9e05318c
|
||||
|
||||
@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 9314af7daf2522c05358a98103780ab1716d2418..1f4317160ca8b628640142a110d93ceb1c4ec421 100644
|
||||
index ce6567f6fd28777f4e10fb2e6ba16f78ac454fd9..a0c39477f7a565307c95df7bf7616d58e6960d30 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
|
||||
@@ -82,6 +82,11 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
|
||||
@@ -1341,7 +1341,7 @@ index 9314af7daf2522c05358a98103780ab1716d2418..1f4317160ca8b628640142a110d93ceb
|
||||
|
||||
@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 c7aa68cc7d8403a7dedf445fda30e6ee709f463d..62f607a3d34511a7f3b90739265ea1b825b517de 100644
|
||||
index 2dc41320ad62d3b88d64baea3358957ce990cb23..afe866e4a41a824bcfb9aa70779c52381386c472 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
|
||||
@@ -121,6 +121,11 @@ public class Zombie extends Monster {
|
||||
@@ -1366,7 +1366,7 @@ index c7aa68cc7d8403a7dedf445fda30e6ee709f463d..62f607a3d34511a7f3b90739265ea1b8
|
||||
|
||||
@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 09fa0b71bd9b207eba3f0e7ac104ccef9dac1cc8..5bd562ce81955ea8c75e08f69d4a033040a6c679 100644
|
||||
index 5e17e5bedf41e246a4e8c4d04b71d1bec4184fb9..d24e41ac992972d1679c279b10290c01db73a5b5 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
|
||||
@@ -94,6 +94,16 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
|
||||
@@ -1387,7 +1387,7 @@ index 09fa0b71bd9b207eba3f0e7ac104ccef9dac1cc8..5bd562ce81955ea8c75e08f69d4a0330
|
||||
|
||||
@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 838420f5d61eaf5e4abb52751b010d57def21d6f..aca84be04c50188612f69ee20e9a0948fe5e5b7f 100644
|
||||
index d1d36feab3ebfc0311b29997c2b81b7d53f638f4..cdeb39d02b618b648681ca51a592b7b3508e46f5 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
|
||||
@@ -78,6 +78,11 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
|
||||
@@ -1412,7 +1412,7 @@ index 838420f5d61eaf5e4abb52751b010d57def21d6f..aca84be04c50188612f69ee20e9a0948
|
||||
|
||||
@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 c2eeae87d011dfb0bec574c36e262dc1cc218131..bd61507c88bf5dd41a4b373ed8102744d94c994d 100644
|
||||
index cded207699b4500b1d9ea90cbde9b27c14cf8192..9cc42b4a1ea0d2315350e038034dfe7171668658 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
|
||||
@@ -82,6 +82,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
|
||||
@@ -1428,7 +1428,7 @@ index c2eeae87d011dfb0bec574c36e262dc1cc218131..bd61507c88bf5dd41a4b373ed8102744
|
||||
|
||||
@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 11f10a11bcdacd9419775684cfb862f5228a28bc..ad2ce84fdf70e0a5457c3e1ac69e80a4707d14f6 100644
|
||||
index 580482c976e81452720dc3fa0f86babccd8e6e2f..5bc02e73ffde3d0d164532b6b8ce42213dc6eadc 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
|
||||
@@ -112,6 +112,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
|
||||
@@ -1444,7 +1444,7 @@ index 11f10a11bcdacd9419775684cfb862f5228a28bc..ad2ce84fdf70e0a5457c3e1ac69e80a4
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
|
||||
index ff149234a8f3e1c94961e41d5bc8117460b301d9..75db61c5aab66234b26f7899229ddca8896e2086 100644
|
||||
index 442d0ce3f3376d8a544b60d7832ea72630fcbca4..b931880d8cda19bc042bacc98a6a5fead9d54303 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
|
||||
@@ -56,6 +56,11 @@ public class PiglinBrute extends AbstractPiglin {
|
||||
@@ -1460,7 +1460,7 @@ index ff149234a8f3e1c94961e41d5bc8117460b301d9..75db61c5aab66234b26f7899229ddca8
|
||||
|
||||
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 4ddafd4d4ffc332b5787faa39d7a8e754bb56c9c..94cdb6695a8991c446358854e437ad00970fecc9 100644
|
||||
index 05ec03fb3b3c84ca2d2f58ca0b70459f90760601..9c3541a3506f270dd79e52103c4f83ad0df0ae94 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
||||
@@ -173,6 +173,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
|
||||
@@ -1476,7 +1476,7 @@ index 4ddafd4d4ffc332b5787faa39d7a8e754bb56c9c..94cdb6695a8991c446358854e437ad00
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
|
||||
index e6890083f3a550f30d60ad544aefc00aa2a45ac6..649f6a8bb9adac0369e8c57eef0dc35cc21f97b9 100644
|
||||
index 774da46962f70e73d31ea523eb5bfc286f38856d..d2324e2dbd72fcd5a8ab562bc3b6e53088647137 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
|
||||
@@ -84,6 +84,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
|
||||
|
||||
@@ -4,6 +4,19 @@ Date: Sun, 6 Oct 2019 12:46:35 -0500
|
||||
Subject: [PATCH] Add option to set armorstand step height
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
index d6ac9c9811449a651e6d13538b9efa7015617b09..2e263243651e9feb1ea7e011507502b6a634a49c 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -319,7 +319,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
||||
public double xOld;
|
||||
public double yOld;
|
||||
public double zOld;
|
||||
- private float maxUpStep;
|
||||
+ public float maxUpStep; // Purpur - private -> public
|
||||
public boolean noPhysics;
|
||||
protected final RandomSource random;
|
||||
public int tickCount;
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
|
||||
index 3677dd991ae73428984e62e4d6fb757317987887..697d6d6cca0a1c8df9c5bf6852495130a0c57eb4 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
|
||||
|
||||
@@ -5,10 +5,10 @@ Subject: [PATCH] Ender dragon always drop full exp
|
||||
|
||||
|
||||
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 ed69b63610bc4214367c793795e5e7aae548ae6f..398a9abc0ad9d9d97a469e69fb2cb950870b9717 100644
|
||||
index 09ed5144c448f7620b5c856a9fa12da07ec0cce6..1612705ba8cf58286a00b4d542541d17b901d286 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
|
||||
@@ -715,7 +715,7 @@ public class EnderDragon extends Mob implements Enemy {
|
||||
@@ -714,7 +714,7 @@ public class EnderDragon extends Mob implements Enemy {
|
||||
boolean flag = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT);
|
||||
short short0 = 500;
|
||||
|
||||
|
||||
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to disable dolphin treasure searching
|
||||
|
||||
|
||||
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 6374fbde49bd9f750f03a454b9f188ff8eded44f..52727f78bb8c3d5f969a88d33c5d1899a5ced38a 100644
|
||||
index 0accc5595461ce92259e3f819a9837aabd442d77..3b65375703732966d0fcbbb68ba0805edd26bfd8 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
|
||||
@@ -486,6 +486,7 @@ public class Dolphin extends WaterAnimal {
|
||||
@@ -481,6 +481,7 @@ public class Dolphin extends WaterAnimal {
|
||||
|
||||
@Override
|
||||
public boolean canUse() {
|
||||
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Stop squids floating on top of water
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
index 4e122ac7ba7040d5c0e8e2ab57610a46f884fa75..c928b8451815ac68b45bd5ac4e0ebbea5be82e34 100644
|
||||
index c9b2798db90a6743112caa80992d6547c8b8d996..b5552ede65f9acf86880909f822fab08eb9e75a8 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -4184,6 +4184,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
||||
@@ -22,10 +22,10 @@ index 4e122ac7ba7040d5c0e8e2ab57610a46f884fa75..c928b8451815ac68b45bd5ac4e0ebbea
|
||||
if (this.touchingUnloadedChunk()) {
|
||||
return false;
|
||||
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 78be2f5d8f8d5267f795bfa1e9e24c4fa701ac83..0d2da2111b039b02b984705d7adde51ed10d3c9d 100644
|
||||
index 0c2b930a0fc5e32afd12a4850acaaa7eb732fc01..de1bf4aea2661763948aba01d93e7685f3ef73cb 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
|
||||
@@ -80,6 +80,12 @@ public class Squid extends WaterAnimal {
|
||||
@@ -75,6 +75,12 @@ public class Squid extends WaterAnimal {
|
||||
public void initAttributes() {
|
||||
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.squidMaxHealth);
|
||||
}
|
||||
|
||||
@@ -5,10 +5,10 @@ Subject: [PATCH] Flying squids! Oh my!
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
|
||||
index cb79d2c958fbd34f8c8818e7e1c0db8887dd15ba..b6df98797757462f35c306aa4c6ea1585a9a6ddc 100644
|
||||
index b86329a18dc83073462049da975dd71b9d637ab2..b0581379619a1ac510b1973512f70db0e961a1f3 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
|
||||
@@ -43,6 +43,11 @@ public class GlowSquid extends Squid {
|
||||
@@ -39,6 +39,11 @@ public class GlowSquid extends Squid {
|
||||
public void initAttributes() {
|
||||
this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.glowSquidMaxHealth);
|
||||
}
|
||||
@@ -21,10 +21,10 @@ index cb79d2c958fbd34f8c8818e7e1c0db8887dd15ba..b6df98797757462f35c306aa4c6ea158
|
||||
|
||||
@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 0d2da2111b039b02b984705d7adde51ed10d3c9d..eee6224629c81a3a5c0b502de95f79fa9a79378f 100644
|
||||
index de1bf4aea2661763948aba01d93e7685f3ef73cb..c396874d24ae535b4c07649e303e60b7ab158811 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
|
||||
@@ -86,6 +86,15 @@ public class Squid extends WaterAnimal {
|
||||
@@ -81,6 +81,15 @@ public class Squid extends WaterAnimal {
|
||||
// Stops squids from floating just over the water
|
||||
return super.getAxisForFluidCheck().offsetY(level.purpurConfig.squidOffsetWaterCheck);
|
||||
}
|
||||
@@ -40,7 +40,7 @@ index 0d2da2111b039b02b984705d7adde51ed10d3c9d..eee6224629c81a3a5c0b502de95f79fa
|
||||
// Purpur end
|
||||
|
||||
@Override
|
||||
@@ -160,6 +169,7 @@ public class Squid extends WaterAnimal {
|
||||
@@ -155,6 +164,7 @@ public class Squid extends WaterAnimal {
|
||||
}
|
||||
|
||||
if (this.isInWaterOrBubble()) {
|
||||
@@ -48,7 +48,7 @@ index 0d2da2111b039b02b984705d7adde51ed10d3c9d..eee6224629c81a3a5c0b502de95f79fa
|
||||
if (this.tentacleMovement < 3.1415927F) {
|
||||
float f = this.tentacleMovement / 3.1415927F;
|
||||
|
||||
@@ -319,7 +329,7 @@ public class Squid extends WaterAnimal {
|
||||
@@ -314,7 +324,7 @@ public class Squid extends WaterAnimal {
|
||||
|
||||
if (i > 100) {
|
||||
this.squid.setMovementVector(0.0F, 0.0F, 0.0F);
|
||||
|
||||
@@ -47,7 +47,7 @@ index f185215b826c4b50a819c8454089cb8ccdb0ed3a..2ac88f06ebb79e515cd9934ac1e3e2c8
|
||||
other.resetLove();
|
||||
world.addFreshEntityWithPassengers(entityageable, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BREEDING); // CraftBukkit - added SpawnReason
|
||||
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 9e1f476a9a0139b906978c3fbf14a4d847931bb2..be5fe508b9274d291e0c67a1270e636b11e7bc6a 100644
|
||||
index 1ff79871121944864da0b5179bba17f97c551608..609fc99fb2f6120af1220ca9dda9ed05686c1448 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
|
||||
@@ -219,6 +219,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
|
||||
@@ -63,7 +63,7 @@ index 9e1f476a9a0139b906978c3fbf14a4d847931bb2..be5fe508b9274d291e0c67a1270e636b
|
||||
|
||||
@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 a7fed154c677b9c7b726ed0cfac766abbd44fc54..2930100746d9119f410f2cc87847993a850b9a1c 100644
|
||||
index 61f83ec67c68dfafbdb11ed88f02d2be526ab7f9..7b3faddc9731ef34708f4caed51c48868159d4c6 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
|
||||
@@ -125,6 +125,11 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
|
||||
@@ -79,7 +79,7 @@ index a7fed154c677b9c7b726ed0cfac766abbd44fc54..2930100746d9119f410f2cc87847993a
|
||||
|
||||
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 7b668c675b1d8ad55e1e72c8adb08a4ddcb51613..d8168f5145380c5e2c337cd24d9b2c0fdf43b534 100644
|
||||
index 4b66412d04a28e3ee0a6e6c5fa0f3f4bf633d2d8..68c90c92409e79011aff84f655b391ba113804a2 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
|
||||
@@ -77,6 +77,11 @@ public class Chicken extends Animal {
|
||||
@@ -95,7 +95,7 @@ index 7b668c675b1d8ad55e1e72c8adb08a4ddcb51613..d8168f5145380c5e2c337cd24d9b2c0f
|
||||
|
||||
@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 8744649fbd3f11485d5862d6f1fb32ea27f11e77..c58076635cc94c8908a376fba8804206cda3ac00 100644
|
||||
index 757b846bb1591c36e6b4413e3a8534986a84233f..6974e10842c66906a2ee70add8b7f046f312301c 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
|
||||
@@ -63,6 +63,11 @@ public class Cow extends Animal {
|
||||
@@ -111,7 +111,7 @@ index 8744649fbd3f11485d5862d6f1fb32ea27f11e77..c58076635cc94c8908a376fba8804206
|
||||
|
||||
@Override
|
||||
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 e2cf88d55aeb1cf8f55292e9171a1b44872bba34..f23c99f8b5c438d4a8e423be86073cba78f73c4c 100644
|
||||
index 2119cdd90228f9034781b9496640b159343afbd8..bbd14bd8f2da3457fe9520be50b43e05e57998f3 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
||||
@@ -184,6 +184,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
|
||||
@@ -140,7 +140,7 @@ index e2cf88d55aeb1cf8f55292e9171a1b44872bba34..f23c99f8b5c438d4a8e423be86073cba
|
||||
this.partner.resetLove();
|
||||
worldserver.addFreshEntityWithPassengers(entityfox, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BREEDING); // CraftBukkit - added SpawnReason
|
||||
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 2f85004a9dac740a9ddadd18b47cf3be821e5add..2b6d1fa7aaffde048678e3f797fb0c6ffd781cff 100644
|
||||
index 51c032e06bbf64e688778053056acef042c5b4b8..1b4d9c39bae147442d6bf9f742f9233c80c44363 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
|
||||
@@ -83,6 +83,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
|
||||
@@ -156,7 +156,7 @@ index 2f85004a9dac740a9ddadd18b47cf3be821e5add..2b6d1fa7aaffde048678e3f797fb0c6f
|
||||
|
||||
@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 0959bcb5974cb690a08cb679ecc9b437f0a7b1ed..462bfbe58d65fb2a7ebfdd2614d8646fef841247 100644
|
||||
index 5b2996a782e8f2ad01c587aac113074c5c382da0..4b20204c2d4fcbe1eb075dccac9618b89e0f9dc2 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
|
||||
@@ -88,6 +88,11 @@ public class Ocelot extends Animal {
|
||||
@@ -172,7 +172,7 @@ index 0959bcb5974cb690a08cb679ecc9b437f0a7b1ed..462bfbe58d65fb2a7ebfdd2614d8646f
|
||||
|
||||
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 f08bb1f0fa2f841e463a804879e42ce09818dfe9..44085d10ca8effa77644e4ccceac7d58f24f2cbe 100644
|
||||
index e5156dba9cf467e73c2376ffabafc437bc9e3536..560af707b9e1175e8e40c999be9b4f615815e1f5 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
||||
@@ -138,6 +138,11 @@ public class Panda extends Animal {
|
||||
@@ -188,7 +188,7 @@ index f08bb1f0fa2f841e463a804879e42ce09818dfe9..44085d10ca8effa77644e4ccceac7d58
|
||||
|
||||
@Override
|
||||
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 a3fcca088601d4a7ecaf467d8742707977451387..8eed08f480a15ae20a2905532e91ba4aa49f80ca 100644
|
||||
index e031a0a60253d896788cf14aaf65d4001d74d9a8..ea570aeb67a493f8c538b2926c517d49c71739cf 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
|
||||
@@ -194,6 +194,11 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
|
||||
@@ -204,7 +204,7 @@ index a3fcca088601d4a7ecaf467d8742707977451387..8eed08f480a15ae20a2905532e91ba4a
|
||||
|
||||
@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 2ef7c9b1f10676117fff7b92d12a5dafe64fd7e0..ac5d2a2f65502f0798c74aa39314556a1269c2be 100644
|
||||
index 97e2b3a4445d195021a67567c4b0c3346095e7e8..39b75ee52e48cf4b00a635152c534e4f64646fb7 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
|
||||
@@ -84,6 +84,11 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
|
||||
@@ -220,7 +220,7 @@ index 2ef7c9b1f10676117fff7b92d12a5dafe64fd7e0..ac5d2a2f65502f0798c74aa39314556a
|
||||
|
||||
@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 dedc36ea78a97fc1303a8b3b328dd1fbef09c25c..2f75167013bf97b8f05ebf738fce9e11d2cc0755 100644
|
||||
index e439ce2c0752ee772df888ccccf9d97e45a83b1c..af499a8b6d16669dc72f85a05f8e153b31ad8599 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
|
||||
@@ -118,6 +118,11 @@ public class PolarBear extends Animal implements NeutralMob {
|
||||
@@ -236,7 +236,7 @@ index dedc36ea78a97fc1303a8b3b328dd1fbef09c25c..2f75167013bf97b8f05ebf738fce9e11
|
||||
|
||||
@Nullable
|
||||
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 5e8ff7dd3ff4c27dfad16da9dd8d0a9f1b94ccb2..c290cf0d3a57705e347d0d513d18178f48c9cd9c 100644
|
||||
index 92da91319f59745f43529b9ddae032a8f60f693d..f564460d4d66fc8cdb163759e6fd8a81ac619661 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
|
||||
@@ -140,6 +140,11 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
|
||||
@@ -252,7 +252,7 @@ index 5e8ff7dd3ff4c27dfad16da9dd8d0a9f1b94ccb2..c290cf0d3a57705e347d0d513d18178f
|
||||
|
||||
// CraftBukkit start - code from constructor
|
||||
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 6c49c268aac993bc00487f03d1ad437af6a76520..8810d2d090eea2913c26ee909b481d2bba82a3d8 100644
|
||||
index 0b9c36f130a0ccd62bbf2418896627553bc61225..70e8ee40ec545b9be7f55f64f251864b03bacaac 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
|
||||
@@ -136,6 +136,11 @@ public class Sheep extends Animal implements Shearable {
|
||||
@@ -268,7 +268,7 @@ index 6c49c268aac993bc00487f03d1ad437af6a76520..8810d2d090eea2913c26ee909b481d2b
|
||||
|
||||
@Override
|
||||
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 986e79c4129c64d328baa4202602552f8364459b..b5c832c43f96933ce81ded1757d9aebce32b91c4 100644
|
||||
index 31c98011ee4521acebf8d452f135e534ffafd64c..7ee3c81f95907886c4036fb5ab9c16aebea38a85 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
|
||||
@@ -103,6 +103,11 @@ public class Turtle extends Animal {
|
||||
@@ -284,7 +284,7 @@ index 986e79c4129c64d328baa4202602552f8364459b..b5c832c43f96933ce81ded1757d9aebc
|
||||
|
||||
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 876e8d226068c60ebab679469483929f98e6ae7f..681957332f620801bf79050ec6526441e344455b 100644
|
||||
index 4713da69b3f45bfcf423726feff2800560494306..8e5b38aaba602ef8bd2ee615569fa25fd979531b 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
||||
@@ -127,6 +127,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
|
||||
@@ -300,10 +300,10 @@ index 876e8d226068c60ebab679469483929f98e6ae7f..681957332f620801bf79050ec6526441
|
||||
|
||||
@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 c18f27a2c6076f26ff4e3fcea44beda31b93a5fc..21c599a0b091f1514295ccbdf303f1af8cc729eb 100644
|
||||
index eaf2e6b9865a36b7c648bd1205db922a62cd7ee8..1af75e173958c192b8f53b7e17e75d980cbbbcbc 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
|
||||
@@ -123,6 +123,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
|
||||
@@ -118,6 +118,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
|
||||
public void initAttributes() {
|
||||
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.axolotlMaxHealth);
|
||||
}
|
||||
@@ -334,7 +334,7 @@ index 40323720d9ded9e3bc5eb2f16b43bb801f6f833c..14386280e7ab006787054ca17503ec8e
|
||||
public void addAdditionalSaveData(CompoundTag nbt) {
|
||||
super.addAdditionalSaveData(nbt);
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
|
||||
index e1ef6b5da3519a9b324afe2608bc54229862e937..c544db9508c39a062480e42a98ab0b5ba6fb9e59 100644
|
||||
index 00bac64a6417b9e34c2b441a13e80052ad66a2c1..61c604a05eedb1928bdac8c8544b0cad074f29ee 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
|
||||
@@ -139,6 +139,10 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
|
||||
@@ -349,7 +349,7 @@ index e1ef6b5da3519a9b324afe2608bc54229862e937..c544db9508c39a062480e42a98ab0b5b
|
||||
|
||||
@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 2c1c2f62780e2b6a8c8906c0a965704fe8ce1d1e..151f08b17ed201736750758875cb38f261bdfe53 100644
|
||||
index 44c1da8784cfeac754f5b43c1ac3bff12c4a262d..9fc6241c08aabfb4e21ee1eb4fb15226c718e0a4 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
|
||||
@@ -109,6 +109,11 @@ public class Goat extends Animal {
|
||||
@@ -365,7 +365,7 @@ index 2c1c2f62780e2b6a8c8906c0a965704fe8ce1d1e..151f08b17ed201736750758875cb38f2
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
|
||||
index 9e8af2437b06bd443db849dd3706b56871de2bf9..214b8c4df1b08aac9d454271f58ca3a794b7014e 100644
|
||||
index 1bf1bff1332cca89ba2df11f397473701b61fc7e..56746fca617a0ede20b6d71e8f2a39400f529b25 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
|
||||
@@ -35,6 +35,11 @@ public class Donkey extends AbstractChestedHorse {
|
||||
@@ -381,7 +381,7 @@ index 9e8af2437b06bd443db849dd3706b56871de2bf9..214b8c4df1b08aac9d454271f58ca3a7
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
|
||||
index 07a9cffe06fe8cbdd499b7c78e2129a3f3bc5630..e824c2c6ce50fd54a0534a0fc332529e7ae599fa 100644
|
||||
index ac8ba7652e0ca9f940152de09dc6cac564b99a2e..7984e920034af1cfa68179f82b9a51c5345cceb5 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
|
||||
@@ -60,6 +60,11 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
|
||||
@@ -397,7 +397,7 @@ index 07a9cffe06fe8cbdd499b7c78e2129a3f3bc5630..e824c2c6ce50fd54a0534a0fc332529e
|
||||
|
||||
@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 35fb0f92a94d141c98b3cd8927c76c35a921e04e..32f3ed0326cfaa80d92dbe75e92abc26945048be 100644
|
||||
index a7238c95aa7bdf98c9fcd82d993bdf63e2feb1fa..d83ab783d5faeea8af25826ec24a337abb852e98 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
|
||||
@@ -136,6 +136,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
|
||||
@@ -413,7 +413,7 @@ index 35fb0f92a94d141c98b3cd8927c76c35a921e04e..32f3ed0326cfaa80d92dbe75e92abc26
|
||||
|
||||
public boolean isTraderLlama() {
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
|
||||
index da036b6913057bf4f4ce890430a8fdafb29f4b36..2ff49a429ba04b5d5daf1571c6c03e37152c408d 100644
|
||||
index e5f6de903d533bbef0083d270618e2a59e7096d2..205a738ce558eb0d2686e945b5831151fe7f1c2f 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
|
||||
@@ -34,6 +34,11 @@ public class Mule extends AbstractChestedHorse {
|
||||
@@ -445,7 +445,7 @@ index e34e34a276a926c72c98bb1f9d2bacc26bde4d4f..244e38548c1ccbf0720dc074a2385d21
|
||||
|
||||
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 aa912a52f2652dd06e309a546076e4dff6f1be7c..988cb4e547ec61f4bc3c17224dd8f4d7033e6b31 100644
|
||||
index 540fcb9dff24208d363dcd416ad7adc3f6112776..494bd7180a8c0dc6bfdff5c2fb989efefaaf77ee 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
|
||||
@@ -62,6 +62,11 @@ public class TraderLlama extends Llama {
|
||||
@@ -461,7 +461,7 @@ index aa912a52f2652dd06e309a546076e4dff6f1be7c..988cb4e547ec61f4bc3c17224dd8f4d7
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
|
||||
index 81d738b34386ef178973c54deb4229c6089d31b7..3164d829cd061b0cf13da10d32bdcbe193995953 100644
|
||||
index 22dbda04f4cb372063410bd10a3473631acef8af..2b3c197ff241f19ba251f08e080129280b3219f3 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
|
||||
@@ -46,6 +46,11 @@ public class ZombieHorse extends AbstractHorse {
|
||||
@@ -477,7 +477,7 @@ index 81d738b34386ef178973c54deb4229c6089d31b7..3164d829cd061b0cf13da10d32bdcbe1
|
||||
|
||||
public static AttributeSupplier.Builder createAttributes() {
|
||||
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 5fb06339822ec90db669a282c42fe1c25b0bc1f0..d586c311d19b981427f5977b4ec84e4d1abe5e97 100644
|
||||
index b512ac4b75e53c272a3c41fb5b66c84b6b0e9847..fbc2e3f0b73608a999619469cd701692cb1cb788 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
|
||||
@@ -120,6 +120,11 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
|
||||
@@ -493,7 +493,7 @@ index 5fb06339822ec90db669a282c42fe1c25b0bc1f0..d586c311d19b981427f5977b4ec84e4d
|
||||
|
||||
public static boolean checkStriderSpawnRules(EntityType<Strider> type, LevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource random) {
|
||||
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 bd61507c88bf5dd41a4b373ed8102744d94c994d..f442c8457a9efd47311cb3a2594112c820de8902 100644
|
||||
index 9cc42b4a1ea0d2315350e038034dfe7171668658..8e837ce3069ca05bcc93ea93f94c79342ea9eb3c 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
|
||||
@@ -87,6 +87,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
|
||||
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
index 723dc56e14ea4b6192d576bab5ff2978ca45ad78..41b03010c42d4692187803e3debc01c5182bac3a 100644
|
||||
index 56781b5cf331400703bdda49508390651b506208..11f7902e30771d5c279e0116b813295a5daf3510 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
@@ -1715,7 +1715,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
||||
@@ -92,7 +92,7 @@ index d3e91faee8805e88d850740fb5de9e5c8288c48b..fe526ebf395ff9813b94284fc3f01423
|
||||
} else if (this.nextStartTick > 0) {
|
||||
--this.nextStartTick;
|
||||
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 f23c99f8b5c438d4a8e423be86073cba78f73c4c..3e1d14711b5ebe1d6b3034674dbb3978abb326b1 100644
|
||||
index bbd14bd8f2da3457fe9520be50b43e05e57998f3..d63b31653504ee69532c3304782a5d55248c2581 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
||||
@@ -1377,7 +1377,7 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
|
||||
@@ -105,7 +105,7 @@ index f23c99f8b5c438d4a8e423be86073cba78f73c4c..3e1d14711b5ebe1d6b3034674dbb3978
|
||||
|
||||
if (iblockdata.is(Blocks.SWEET_BERRY_BUSH)) {
|
||||
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 c290cf0d3a57705e347d0d513d18178f48c9cd9c..da6607687c56cf6a70e32b749672e0335e3cc510 100644
|
||||
index f564460d4d66fc8cdb163759e6fd8a81ac619661..146847aeda3f886f8a3fad14cf23b0846f3f7418 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
|
||||
@@ -630,7 +630,7 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
|
||||
@@ -118,7 +118,7 @@ index c290cf0d3a57705e347d0d513d18178f48c9cd9c..da6607687c56cf6a70e32b749672e033
|
||||
}
|
||||
|
||||
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 423dbacfd06c723781d72376159e7e88bfcea383..d941bdf92c1f7c773a6dd617990f85fcb106c0e8 100644
|
||||
index 5ae7f8dcb39cdf9bfc760f47a6745b819b6596b2..7da3aa9b77dfecd06ca6d604ee285cad800f2f9b 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
|
||||
@@ -127,7 +127,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
|
||||
@@ -131,10 +131,10 @@ index 423dbacfd06c723781d72376159e7e88bfcea383..d941bdf92c1f7c773a6dd617990f85fc
|
||||
}
|
||||
|
||||
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 398a9abc0ad9d9d97a469e69fb2cb950870b9717..536a893820d66f53c26dc0ee8120f08208b5dc51 100644
|
||||
index 1612705ba8cf58286a00b4d542541d17b901d286..20a59f077b2694e7b46efe9c006589d8d1e13324 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
|
||||
@@ -580,7 +580,7 @@ public class EnderDragon extends Mob implements Enemy {
|
||||
@@ -579,7 +579,7 @@ public class EnderDragon extends Mob implements Enemy {
|
||||
BlockState iblockdata = this.level.getBlockState(blockposition);
|
||||
|
||||
if (!iblockdata.isAir() && !iblockdata.is(BlockTags.DRAGON_TRANSPARENT)) {
|
||||
@@ -144,7 +144,7 @@ index 398a9abc0ad9d9d97a469e69fb2cb950870b9717..536a893820d66f53c26dc0ee8120f082
|
||||
// flag1 = this.level.removeBlock(blockposition, false) || flag1;
|
||||
flag1 = true;
|
||||
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 b4a8c219f609ba9f707edd0afe8abb69c7c0a510..92faba5375e9299feef84a12eef8af2a215e93ae 100644
|
||||
index 631349e333fcc8285b7f23dec86275d0f0bee0ca..f3d16ebbc36c2b97d14d2401f829fc7cd4664634 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
|
||||
@@ -496,7 +496,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
|
||||
@@ -157,7 +157,7 @@ index b4a8c219f609ba9f707edd0afe8abb69c7c0a510..92faba5375e9299feef84a12eef8af2a
|
||||
j = Mth.floor(this.getX());
|
||||
int i1 = Mth.floor(this.getZ());
|
||||
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 7dd726eea053c8c5fc5e40972128f0f3f91039be..b7f1b4238313c21b84d6485de27cd578b49f9d1d 100644
|
||||
index 411b82fd1da4643c4405961e4af3e1aa20e7eb55..ce746c26a5cb7da7defac46ef333abb96beab8a9 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
|
||||
@@ -532,7 +532,15 @@ public class EnderMan extends Monster implements NeutralMob {
|
||||
@@ -195,7 +195,7 @@ index 7dd726eea053c8c5fc5e40972128f0f3f91039be..b7f1b4238313c21b84d6485de27cd578
|
||||
|
||||
@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 6c3ca27b03e98771aed8710b09a9caf493de4dcf..d1a9cde8bb922f62fb0098e8a4d725c62adf5dbb 100644
|
||||
index d0342c28f028a26536ef8e42302ea310a6064a18..fe6065c7321c0d3e6eb047d6f9a6d382b8ab5be9 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
|
||||
@@ -341,7 +341,7 @@ public class Evoker extends SpellcasterIllager {
|
||||
@@ -208,7 +208,7 @@ index 6c3ca27b03e98771aed8710b09a9caf493de4dcf..d1a9cde8bb922f62fb0098e8a4d725c6
|
||||
} else {
|
||||
List<Sheep> list = Evoker.this.level.getNearbyEntities(Sheep.class, this.wololoTargeting, Evoker.this, Evoker.this.getBoundingBox().inflate(16.0D, 4.0D, 16.0D));
|
||||
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 b782b39a0efa651104537d0f422685128708aa7e..ef2fd3f55768be5534aa9fcacb3bd5841cfd6789 100644
|
||||
index 2a176517488bbe0804deaf3948dcfe7eee9e9089..af2eddeb3d4c4dcb1f6862b5aefd26c0964fef63 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
|
||||
@@ -190,7 +190,7 @@ public class Ravager extends Raider {
|
||||
@@ -221,7 +221,7 @@ index b782b39a0efa651104537d0f422685128708aa7e..ef2fd3f55768be5534aa9fcacb3bd584
|
||||
AABB axisalignedbb = this.getBoundingBox().inflate(0.2D);
|
||||
Iterator iterator = BlockPos.betweenClosed(Mth.floor(axisalignedbb.minX), Mth.floor(axisalignedbb.minY), Mth.floor(axisalignedbb.minZ), Mth.floor(axisalignedbb.maxX), Mth.floor(axisalignedbb.maxY), Mth.floor(axisalignedbb.maxZ)).iterator();
|
||||
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 26a24da890f451ffba664dbcdbc97ec4870db0ee..42a340e5efcd44917dd0582a73a91c734b964a11 100644
|
||||
index 8efc8d6e05da041efb61776ac0b5363f31f8bb4f..297733b3fdd354f0e837922c8c97f56a4bbf1830 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
|
||||
@@ -208,7 +208,7 @@ public class Silverfish extends Monster {
|
||||
@@ -243,7 +243,7 @@ index 26a24da890f451ffba664dbcdbc97ec4870db0ee..42a340e5efcd44917dd0582a73a91c73
|
||||
BlockPos blockposition = BlockPos.containing(this.mob.getX(), this.mob.getY() + 0.5D, this.mob.getZ()).relative(this.selectedDirection);
|
||||
BlockState iblockdata = this.mob.level.getBlockState(blockposition);
|
||||
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 ad2ce84fdf70e0a5457c3e1ac69e80a4707d14f6..a7f0553eb11f7100152c332ac270b9206e7ee89e 100644
|
||||
index 5bc02e73ffde3d0d164532b6b8ce42213dc6eadc..8d7a65f452018ca0d7f58661aea251ebf96906d6 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
|
||||
@@ -431,7 +431,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
|
||||
|
||||
@@ -5,10 +5,10 @@ Subject: [PATCH] Toggle for water sensitive mob damage
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
|
||||
index b6df98797757462f35c306aa4c6ea1585a9a6ddc..506632a6b5107f5ef08cd87808b8c4be1e96b49f 100644
|
||||
index b0581379619a1ac510b1973512f70db0e961a1f3..7d5b34f69c3ceed3c350ae641eef87cc64c88b43 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
|
||||
@@ -48,6 +48,11 @@ public class GlowSquid extends Squid {
|
||||
@@ -44,6 +44,11 @@ public class GlowSquid extends Squid {
|
||||
public boolean canFly() {
|
||||
return this.level.purpurConfig.glowSquidsCanFly;
|
||||
}
|
||||
@@ -21,7 +21,7 @@ index b6df98797757462f35c306aa4c6ea1585a9a6ddc..506632a6b5107f5ef08cd87808b8c4be
|
||||
|
||||
@Override
|
||||
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 6677c60e7405a6f6b4f236b67616b3640cc22919..a108716b9945fafc8c51835151bc7e0ff903be35 100644
|
||||
index f0ba6e7971090e086fd7a70a510ae91c104f0ae9..fa9ed6d5ae13ddd14ef8677ca9ad30398a2333f4 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
|
||||
@@ -105,6 +105,11 @@ public class Bat extends AmbientCreature {
|
||||
@@ -37,7 +37,7 @@ index 6677c60e7405a6f6b4f236b67616b3640cc22919..a108716b9945fafc8c51835151bc7e0f
|
||||
|
||||
@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 be5fe508b9274d291e0c67a1270e636b11e7bc6a..04656231fa0f96eaeb9ae463695ede400b07df09 100644
|
||||
index 609fc99fb2f6120af1220ca9dda9ed05686c1448..f379f4c45c5aaf8aa8d166148cdc07517c84649a 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
|
||||
@@ -176,7 +176,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
|
||||
@@ -62,7 +62,7 @@ index be5fe508b9274d291e0c67a1270e636b11e7bc6a..04656231fa0f96eaeb9ae463695ede40
|
||||
|
||||
@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 d34e2830e13a3cc4ff84ba207858ebe99fe751c2..60259730eef583c13a07f6ac2a41a2a8db96dd7a 100644
|
||||
index dc79deffd450d676a0950c726c505501b0204817..c1ec34249d07a22708905c593ffd61593935d7ef 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
|
||||
@@ -130,6 +130,11 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
|
||||
@@ -78,7 +78,7 @@ index d34e2830e13a3cc4ff84ba207858ebe99fe751c2..60259730eef583c13a07f6ac2a41a2a8
|
||||
|
||||
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 d8168f5145380c5e2c337cd24d9b2c0fdf43b534..2d17d02a9efee54f4e7456088eaee416253d235d 100644
|
||||
index 68c90c92409e79011aff84f655b391ba113804a2..ea35213552ed5b799d3b7aef225383f030fcb07a 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
|
||||
@@ -82,6 +82,11 @@ public class Chicken extends Animal {
|
||||
@@ -94,10 +94,10 @@ index d8168f5145380c5e2c337cd24d9b2c0fdf43b534..2d17d02a9efee54f4e7456088eaee416
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/Cod.java b/src/main/java/net/minecraft/world/entity/animal/Cod.java
|
||||
index 861727f150f28a508d3b1c7067d410f0d696aa89..5b79d821e8b55c8876eadcbe811a2c0584e7e02b 100644
|
||||
index 47b537deac66f93a66a1df007b2bb8afac0ed079..abd24e7434712e806a14dc0e708a76aa03ba258f 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Cod.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Cod.java
|
||||
@@ -33,6 +33,11 @@ public class Cod extends AbstractSchoolingFish {
|
||||
@@ -28,6 +28,11 @@ public class Cod extends AbstractSchoolingFish {
|
||||
public void initAttributes() {
|
||||
this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.codMaxHealth);
|
||||
}
|
||||
@@ -110,7 +110,7 @@ index 861727f150f28a508d3b1c7067d410f0d696aa89..5b79d821e8b55c8876eadcbe811a2c05
|
||||
|
||||
@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 c58076635cc94c8908a376fba8804206cda3ac00..48d20fcd481e76e180410c11040b2164315fce23 100644
|
||||
index 6974e10842c66906a2ee70add8b7f046f312301c..ece8f5c4277d6b42fd19df64bfa624f96f1390ca 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
|
||||
@@ -68,6 +68,11 @@ public class Cow extends Animal {
|
||||
@@ -126,10 +126,10 @@ index c58076635cc94c8908a376fba8804206cda3ac00..48d20fcd481e76e180410c11040b2164
|
||||
|
||||
@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 52727f78bb8c3d5f969a88d33c5d1899a5ced38a..238556dfd610ca01666ff316af82f2890cf486b4 100644
|
||||
index 3b65375703732966d0fcbbb68ba0805edd26bfd8..f8d3a5d2dc254501c7e4405444ed4439f9af915e 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
|
||||
@@ -162,6 +162,11 @@ public class Dolphin extends WaterAnimal {
|
||||
@@ -157,6 +157,11 @@ public class Dolphin extends WaterAnimal {
|
||||
public void initAttributes() {
|
||||
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.dolphinMaxHealth);
|
||||
}
|
||||
@@ -142,7 +142,7 @@ index 52727f78bb8c3d5f969a88d33c5d1899a5ced38a..238556dfd610ca01666ff316af82f289
|
||||
|
||||
@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 3e1d14711b5ebe1d6b3034674dbb3978abb326b1..1d030dcf8df462bd21e73172218948086a621a6f 100644
|
||||
index d63b31653504ee69532c3304782a5d55248c2581..bf3166a50930044cc329142670a2f1e77f144e4b 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
||||
@@ -189,6 +189,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
|
||||
@@ -158,7 +158,7 @@ index 3e1d14711b5ebe1d6b3034674dbb3978abb326b1..1d030dcf8df462bd21e7317221894808
|
||||
|
||||
@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 d73d751c1e69c22cc83a7b4d3d716833ef0bd3c2..782949596cd160847a0332f48372d186a5e71eab 100644
|
||||
index 5a3da8390d1b8b4e818da42578174f2016f73407..f25f7db029c0c21f31693349ef567dddeace3db1 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
|
||||
@@ -89,6 +89,11 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
|
||||
@@ -174,7 +174,7 @@ index d73d751c1e69c22cc83a7b4d3d716833ef0bd3c2..782949596cd160847a0332f48372d186
|
||||
|
||||
@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 2b6d1fa7aaffde048678e3f797fb0c6ffd781cff..4973a0da1139bec25d4b9bf16a01934f276f4805 100644
|
||||
index 1b4d9c39bae147442d6bf9f742f9233c80c44363..7bafba53b6c4947a37c02a1f616b8fe74ce4d99b 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
|
||||
@@ -88,6 +88,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
|
||||
@@ -190,7 +190,7 @@ index 2b6d1fa7aaffde048678e3f797fb0c6ffd781cff..4973a0da1139bec25d4b9bf16a01934f
|
||||
|
||||
@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 462bfbe58d65fb2a7ebfdd2614d8646fef841247..72a1f8ecac740b428f35cdcec469bc592d267259 100644
|
||||
index 4b20204c2d4fcbe1eb075dccac9618b89e0f9dc2..d03465ab53d32b967d2077c4759062ab777a3cd2 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
|
||||
@@ -93,6 +93,11 @@ public class Ocelot extends Animal {
|
||||
@@ -206,7 +206,7 @@ index 462bfbe58d65fb2a7ebfdd2614d8646fef841247..72a1f8ecac740b428f35cdcec469bc59
|
||||
|
||||
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 44085d10ca8effa77644e4ccceac7d58f24f2cbe..837072686b4fac2e3217390ed276c1a508321e0f 100644
|
||||
index 560af707b9e1175e8e40c999be9b4f615815e1f5..25e7c75a8319fd17d6e41db75a746778331f22d8 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
||||
@@ -143,6 +143,11 @@ public class Panda extends Animal {
|
||||
@@ -222,7 +222,7 @@ index 44085d10ca8effa77644e4ccceac7d58f24f2cbe..837072686b4fac2e3217390ed276c1a5
|
||||
|
||||
@Override
|
||||
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 8eed08f480a15ae20a2905532e91ba4aa49f80ca..1638b0f23ef2247c6d1055529f47d71ef56b0f55 100644
|
||||
index ea570aeb67a493f8c538b2926c517d49c71739cf..94c9303cf76ea35c5584125a04aadd1772efb7dc 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
|
||||
@@ -199,6 +199,11 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
|
||||
@@ -238,7 +238,7 @@ index 8eed08f480a15ae20a2905532e91ba4aa49f80ca..1638b0f23ef2247c6d1055529f47d71e
|
||||
|
||||
@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 ac5d2a2f65502f0798c74aa39314556a1269c2be..9d2689bd264343a3d34904ca01b5e0d0c029e7e9 100644
|
||||
index 39b75ee52e48cf4b00a635152c534e4f64646fb7..df5e9e79d30993c362cac3f45c1a7a56b6c095de 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
|
||||
@@ -89,6 +89,11 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
|
||||
@@ -254,7 +254,7 @@ index ac5d2a2f65502f0798c74aa39314556a1269c2be..9d2689bd264343a3d34904ca01b5e0d0
|
||||
|
||||
@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 2f75167013bf97b8f05ebf738fce9e11d2cc0755..76fbb48bdbd23117aad53f30244425d865841486 100644
|
||||
index af499a8b6d16669dc72f85a05f8e153b31ad8599..f7f326a29255e3c03b36cbdf1630054ba5fd8be4 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
|
||||
@@ -123,6 +123,11 @@ public class PolarBear extends Animal implements NeutralMob {
|
||||
@@ -270,10 +270,10 @@ index 2f75167013bf97b8f05ebf738fce9e11d2cc0755..76fbb48bdbd23117aad53f30244425d8
|
||||
|
||||
@Nullable
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
|
||||
index 95b839b6346617dcea6e1200d3a816c3d65f97eb..1754f328f676a3545b1a1fd2d944ac4be7fff70b 100644
|
||||
index acfff1e2a54471013c3524e482d35d324d06ea6e..76e2470fd7c8232ed699cb4ece9d0f73743914b6 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
|
||||
@@ -65,6 +65,11 @@ public class Pufferfish extends AbstractFish {
|
||||
@@ -60,6 +60,11 @@ public class Pufferfish extends AbstractFish {
|
||||
public void initAttributes() {
|
||||
this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.pufferfishMaxHealth);
|
||||
}
|
||||
@@ -286,7 +286,7 @@ index 95b839b6346617dcea6e1200d3a816c3d65f97eb..1754f328f676a3545b1a1fd2d944ac4b
|
||||
|
||||
@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 da6607687c56cf6a70e32b749672e0335e3cc510..3425ccad431c41d878586dae7d606a8e6c0dc3a8 100644
|
||||
index 146847aeda3f886f8a3fad14cf23b0846f3f7418..3cc7460f82e0956c9340891987209eabe0b6a97a 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
|
||||
@@ -145,6 +145,11 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
|
||||
@@ -302,10 +302,10 @@ index da6607687c56cf6a70e32b749672e0335e3cc510..3425ccad431c41d878586dae7d606a8e
|
||||
|
||||
// CraftBukkit start - code from constructor
|
||||
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 3873fb0e2d95973397f9a23dc363f7a65a1edfe6..16171814bab7fbc0c177323cc5f8b026c8ebbcd4 100644
|
||||
index 2d525af3955a1f6dfbd21f07d813a832fd7f6c76..cea2f9b5760d82f244950e27ca6f4baed78ec01c 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Salmon.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Salmon.java
|
||||
@@ -33,6 +33,11 @@ public class Salmon extends AbstractSchoolingFish {
|
||||
@@ -28,6 +28,11 @@ public class Salmon extends AbstractSchoolingFish {
|
||||
public void initAttributes() {
|
||||
this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.salmonMaxHealth);
|
||||
}
|
||||
@@ -318,7 +318,7 @@ index 3873fb0e2d95973397f9a23dc363f7a65a1edfe6..16171814bab7fbc0c177323cc5f8b026
|
||||
|
||||
@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 8810d2d090eea2913c26ee909b481d2bba82a3d8..5448b2a5658137f723a5ea3d1d5387fce566e7a0 100644
|
||||
index 70e8ee40ec545b9be7f55f64f251864b03bacaac..14c59e94040a5bcf07e7a134c4a1a0f4453d386a 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
|
||||
@@ -141,6 +141,11 @@ public class Sheep extends Animal implements Shearable {
|
||||
@@ -334,7 +334,7 @@ index 8810d2d090eea2913c26ee909b481d2bba82a3d8..5448b2a5658137f723a5ea3d1d5387fc
|
||||
|
||||
@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 d941bdf92c1f7c773a6dd617990f85fcb106c0e8..351d6deace90cb8a1d9db83ea51400aa617811dc 100644
|
||||
index 7da3aa9b77dfecd06ca6d604ee285cad800f2f9b..707db30bfa6acc0543abb08ee1a646670849d46f 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
|
||||
@@ -116,7 +116,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
|
||||
@@ -347,10 +347,10 @@ index d941bdf92c1f7c773a6dd617990f85fcb106c0e8..351d6deace90cb8a1d9db83ea51400aa
|
||||
|
||||
@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 eee6224629c81a3a5c0b502de95f79fa9a79378f..480e577512a84bcb7749012bc5655f90dfb10be4 100644
|
||||
index c396874d24ae535b4c07649e303e60b7ab158811..f8eef39f269ede559fb5fd4db631f2fb5dadc995 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
|
||||
@@ -95,6 +95,11 @@ public class Squid extends WaterAnimal {
|
||||
@@ -90,6 +90,11 @@ public class Squid extends WaterAnimal {
|
||||
public boolean isInWater() {
|
||||
return this.wasTouchingWater || canFly();
|
||||
}
|
||||
@@ -363,10 +363,10 @@ index eee6224629c81a3a5c0b502de95f79fa9a79378f..480e577512a84bcb7749012bc5655f90
|
||||
|
||||
@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 62f44f830e5b924776d47b3ac36de4166d2e13f7..220a9ca9c78b14b4ca6f76192396db608db184b8 100644
|
||||
index 948d86a125648300a258e08200bb90e9ba8eaf59..ce5fd177521780176708fd0b97f1d57cbd5cb1e4 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
|
||||
@@ -62,6 +62,11 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
|
||||
@@ -57,6 +57,11 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
|
||||
public void initAttributes() {
|
||||
this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.tropicalFishMaxHealth);
|
||||
}
|
||||
@@ -379,7 +379,7 @@ index 62f44f830e5b924776d47b3ac36de4166d2e13f7..220a9ca9c78b14b4ca6f76192396db60
|
||||
|
||||
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 b5c832c43f96933ce81ded1757d9aebce32b91c4..fcc2daf21dfedcee1bf58427d238b929f18082da 100644
|
||||
index 7ee3c81f95907886c4036fb5ab9c16aebea38a85..edcc61a3c2318e5d86486615d36d9eae7327796f 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
|
||||
@@ -108,6 +108,11 @@ public class Turtle extends Animal {
|
||||
@@ -395,7 +395,7 @@ index b5c832c43f96933ce81ded1757d9aebce32b91c4..fcc2daf21dfedcee1bf58427d238b929
|
||||
|
||||
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 a530ee1dfe4aa3fb77a05927b78184aeabd1df85..dc85d95b430e4883eb6508261a4eeee5723d3e40 100644
|
||||
index 06f2225743e27c7f1f0eb15ee6beedc57c8a3b4f..a2500bde559cd191bff6811802ff12980c7be418 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
||||
@@ -207,6 +207,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
|
||||
@@ -411,10 +411,10 @@ index a530ee1dfe4aa3fb77a05927b78184aeabd1df85..dc85d95b430e4883eb6508261a4eeee5
|
||||
|
||||
@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 21c599a0b091f1514295ccbdf303f1af8cc729eb..d173718dbaf8519c76e9347e5c53efa29c46c798 100644
|
||||
index 1af75e173958c192b8f53b7e17e75d980cbbbcbc..5e705c84e5deeb3b3bdede80bf2acd9a252e3972 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
|
||||
@@ -128,6 +128,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
|
||||
@@ -123,6 +123,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
|
||||
public int getPurpurBreedTime() {
|
||||
return this.level.purpurConfig.axolotlBreedingTicks;
|
||||
}
|
||||
@@ -427,7 +427,7 @@ index 21c599a0b091f1514295ccbdf303f1af8cc729eb..d173718dbaf8519c76e9347e5c53efa2
|
||||
|
||||
@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 151f08b17ed201736750758875cb38f261bdfe53..2c09ac502c1814eab6fa142f97f1332c407900d7 100644
|
||||
index 9fc6241c08aabfb4e21ee1eb4fb15226c718e0a4..85d08932d2941f2e75d2449d1a7a6223d529e295 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
|
||||
@@ -114,6 +114,11 @@ public class Goat extends Animal {
|
||||
@@ -443,7 +443,7 @@ index 151f08b17ed201736750758875cb38f261bdfe53..2c09ac502c1814eab6fa142f97f1332c
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
|
||||
index 214b8c4df1b08aac9d454271f58ca3a794b7014e..7f54981b741874cbbf4748b03d31ef2ef11f99b1 100644
|
||||
index 56746fca617a0ede20b6d71e8f2a39400f529b25..c71127d7adb24a1bd14641b79839666412d08662 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
|
||||
@@ -40,6 +40,11 @@ public class Donkey extends AbstractChestedHorse {
|
||||
@@ -459,7 +459,7 @@ index 214b8c4df1b08aac9d454271f58ca3a794b7014e..7f54981b741874cbbf4748b03d31ef2e
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
|
||||
index e824c2c6ce50fd54a0534a0fc332529e7ae599fa..d27b7e160ae2b9eb2d709b875fdaae6c212707a1 100644
|
||||
index 7984e920034af1cfa68179f82b9a51c5345cceb5..22f8d501e2dfb765f0cf3f199efed7c5b1067581 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
|
||||
@@ -65,6 +65,11 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
|
||||
@@ -475,7 +475,7 @@ index e824c2c6ce50fd54a0534a0fc332529e7ae599fa..d27b7e160ae2b9eb2d709b875fdaae6c
|
||||
|
||||
@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 32f3ed0326cfaa80d92dbe75e92abc26945048be..5db7ddd3f4bd79dbcb241aad2abf96ade57ae4c4 100644
|
||||
index d83ab783d5faeea8af25826ec24a337abb852e98..ce31da2f68c5468703ee24e546b829e9006e1eab 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
|
||||
@@ -141,6 +141,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
|
||||
@@ -491,7 +491,7 @@ index 32f3ed0326cfaa80d92dbe75e92abc26945048be..5db7ddd3f4bd79dbcb241aad2abf96ad
|
||||
|
||||
public boolean isTraderLlama() {
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
|
||||
index 2ff49a429ba04b5d5daf1571c6c03e37152c408d..2a44b6cfcbfe484d4267add53b35b07c069a64a9 100644
|
||||
index 205a738ce558eb0d2686e945b5831151fe7f1c2f..32ade7ae57c5fe598e51c8f2d805b280f00e8a2e 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
|
||||
@@ -39,6 +39,11 @@ public class Mule extends AbstractChestedHorse {
|
||||
@@ -523,7 +523,7 @@ index 244e38548c1ccbf0720dc074a2385d21f5edd7ad..a0a28c3d682bd96ac65151293fb8429d
|
||||
|
||||
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 988cb4e547ec61f4bc3c17224dd8f4d7033e6b31..ad5adf8905445ff1aac63827f13cb256889fc67e 100644
|
||||
index 494bd7180a8c0dc6bfdff5c2fb989efefaaf77ee..02b6f2ce6831eb68442d1a4b47764426830dedb5 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
|
||||
@@ -67,6 +67,11 @@ public class TraderLlama extends Llama {
|
||||
@@ -539,7 +539,7 @@ index 988cb4e547ec61f4bc3c17224dd8f4d7033e6b31..ad5adf8905445ff1aac63827f13cb256
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
|
||||
index 3164d829cd061b0cf13da10d32bdcbe193995953..e833f8bdf6e09e6701137650bffd44cdecb3044e 100644
|
||||
index 2b3c197ff241f19ba251f08e080129280b3219f3..a3e33c2a7bbabc0e295c5ed93ca6030b39b10efb 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
|
||||
@@ -51,6 +51,11 @@ public class ZombieHorse extends AbstractHorse {
|
||||
@@ -555,10 +555,10 @@ index 3164d829cd061b0cf13da10d32bdcbe193995953..e833f8bdf6e09e6701137650bffd44cd
|
||||
|
||||
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 536a893820d66f53c26dc0ee8120f08208b5dc51..567f30840947d5f44a15321694799534bd015da8 100644
|
||||
index 20a59f077b2694e7b46efe9c006589d8d1e13324..7ec5da61a57e38146840c6b387104ed6716c24d4 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
|
||||
@@ -167,6 +167,11 @@ public class EnderDragon extends Mob implements Enemy {
|
||||
@@ -166,6 +166,11 @@ public class EnderDragon extends Mob implements Enemy {
|
||||
public void initAttributes() {
|
||||
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.enderDragonMaxHealth);
|
||||
}
|
||||
@@ -571,7 +571,7 @@ index 536a893820d66f53c26dc0ee8120f08208b5dc51..567f30840947d5f44a15321694799534
|
||||
|
||||
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 92faba5375e9299feef84a12eef8af2a215e93ae..7c104e25bebef36fb24adfdb8956da4522fdc9e9 100644
|
||||
index f3d16ebbc36c2b97d14d2401f829fc7cd4664634..0c329f66d0a26b881ddddf4c555850f6ce0481bc 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
|
||||
@@ -234,6 +234,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
|
||||
@@ -587,7 +587,7 @@ index 92faba5375e9299feef84a12eef8af2a215e93ae..7c104e25bebef36fb24adfdb8956da45
|
||||
|
||||
@Override
|
||||
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 1b114ddc9872576a19d8f9e6424fa9c99c207a9d..c09752090d51731f1c3d30ecfc0e28b138fc419c 100644
|
||||
index ae291e741f283d2e56f55512608f5852ef266ccd..ebdc03f76700ed25d4247fb96e0abfae8a613cd6 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Blaze.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
|
||||
@@ -33,7 +33,7 @@ public class Blaze extends Monster {
|
||||
@@ -609,7 +609,7 @@ index 1b114ddc9872576a19d8f9e6424fa9c99c207a9d..c09752090d51731f1c3d30ecfc0e28b1
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
|
||||
index b9ee6fdaad09c92fdeea2e5be606818278a77c21..5347ba12f2a07601c9f044081e5e6ce6472c4a2a 100644
|
||||
index 90dc6df729e72c7925ed2c3d36debb92989b2646..66e3af15c3921facff28bbf9ecef2f919a5be6b3 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
|
||||
@@ -48,6 +48,11 @@ public class CaveSpider extends Spider {
|
||||
@@ -625,7 +625,7 @@ index b9ee6fdaad09c92fdeea2e5be606818278a77c21..5347ba12f2a07601c9f044081e5e6ce6
|
||||
|
||||
@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 bdcd271d3755803edc315f7a5484236ad524b1a3..7a16984f0eb5f48e16dd718f44e39c7cc4a28d9a 100644
|
||||
index ccdf278afc5eab5e05649d54ef30d1c27b8b9daa..8db007569fc8a5085071813e1476a27d0f1cff7c 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
|
||||
@@ -150,6 +150,11 @@ public class Creeper extends Monster implements PowerableMob {
|
||||
@@ -641,7 +641,7 @@ index bdcd271d3755803edc315f7a5484236ad524b1a3..7a16984f0eb5f48e16dd718f44e39c7c
|
||||
|
||||
@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 e141dc0e13206bfdfbd39116edbcd49887a76cd2..31fb0cd50b4263abcdde323e79300c1a88b572c1 100644
|
||||
index 25b71ea8f18946a5de60eee5a075309033312a5c..5ed737a9656546775540c15f81f308d94e7a3444 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
|
||||
@@ -108,6 +108,11 @@ public class Drowned extends Zombie implements RangedAttackMob {
|
||||
@@ -657,10 +657,10 @@ index e141dc0e13206bfdfbd39116edbcd49887a76cd2..31fb0cd50b4263abcdde323e79300c1a
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
|
||||
index 01be40f1740fc689b101fc596dbbb1e66de0bfb1..64193dab104b735a9fa3b335774e662629110c79 100644
|
||||
index 84bac517860c565d26dfa31ee06fac5c41aa035e..0217eebab2bac9f647ec00888190fafb7c741497 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
|
||||
@@ -53,6 +53,11 @@ public class ElderGuardian extends Guardian {
|
||||
@@ -48,6 +48,11 @@ public class ElderGuardian extends Guardian {
|
||||
public void initAttributes() {
|
||||
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.elderGuardianMaxHealth);
|
||||
}
|
||||
@@ -673,7 +673,7 @@ index 01be40f1740fc689b101fc596dbbb1e66de0bfb1..64193dab104b735a9fa3b335774e6626
|
||||
|
||||
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 b7f1b4238313c21b84d6485de27cd578b49f9d1d..9e60e5d8a2005669c3187cdd84d8d7ef8f5da6be 100644
|
||||
index ce746c26a5cb7da7defac46ef333abb96beab8a9..e7308cf659fba62669753ea53e52f40fb96976b1 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
|
||||
@@ -89,7 +89,7 @@ public class EnderMan extends Monster implements NeutralMob {
|
||||
@@ -695,7 +695,7 @@ index b7f1b4238313c21b84d6485de27cd578b49f9d1d..9e60e5d8a2005669c3187cdd84d8d7ef
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/Endermite.java b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
|
||||
index 400045d30353899edc89907deab14943bc5c37eb..9b14ad63c2f2fea0e6c0e69a5632621c98b7a28f 100644
|
||||
index 294eb415d57cf28489d8cfd3d3a9102b9bbe9e9a..5d1f77259732f6da4f993d3a087fdc63fc6215f4 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
|
||||
@@ -57,6 +57,11 @@ public class Endermite extends Monster {
|
||||
@@ -711,7 +711,7 @@ index 400045d30353899edc89907deab14943bc5c37eb..9b14ad63c2f2fea0e6c0e69a5632621c
|
||||
|
||||
@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 d1a9cde8bb922f62fb0098e8a4d725c62adf5dbb..770e6abab4ae2d7c25e9b0d621f3a07de920c8d8 100644
|
||||
index fe6065c7321c0d3e6eb047d6f9a6d382b8ab5be9..ea29765ac38565ab54f3bc9a9d2f36e3ee4700ac 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
|
||||
@@ -68,6 +68,11 @@ public class Evoker extends SpellcasterIllager {
|
||||
@@ -727,7 +727,7 @@ index d1a9cde8bb922f62fb0098e8a4d725c62adf5dbb..770e6abab4ae2d7c25e9b0d621f3a07d
|
||||
|
||||
@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 3cb9b399db596b90d7885e2003ba41f4f79a3588..8ab5dfd2f56d52b275bf160d8a28adce5564a5f2 100644
|
||||
index b21d8d069caffe9c7a6f5a856fb91d5c5b60567e..75efaca73593446d41e0b2d31bcc76b2693248d8 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
|
||||
@@ -81,6 +81,11 @@ public class Ghast extends FlyingMob implements Enemy {
|
||||
@@ -743,7 +743,7 @@ index 3cb9b399db596b90d7885e2003ba41f4f79a3588..8ab5dfd2f56d52b275bf160d8a28adce
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java
|
||||
index ed032918fb33d60c2d60d4db9275dddf88dd72d9..148ad9bc34793e6ed2b4b02aff6f239321504268 100644
|
||||
index fcdf1b04e3dde0562b993794165c2fb649a634bf..a6c2a34e41b01c40596455d07b5425f939b8c515 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Giant.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java
|
||||
@@ -107,6 +107,11 @@ public class Giant extends Monster {
|
||||
@@ -759,10 +759,10 @@ index ed032918fb33d60c2d60d4db9275dddf88dd72d9..148ad9bc34793e6ed2b4b02aff6f2393
|
||||
|
||||
@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 2a71d5ac30c7bd57365002549f591c17bfb67d0e..19e4b5cade77922be60f707e14b787faad684d61 100644
|
||||
index 4292174f1f6c77374aecf74f1ed81929ed5c9249..52d4a0975b1fec03fdd51b8fad8127a79e216be0 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Guardian.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
|
||||
@@ -99,6 +99,11 @@ public class Guardian extends Monster {
|
||||
@@ -94,6 +94,11 @@ public class Guardian extends Monster {
|
||||
public void initAttributes() {
|
||||
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.guardianMaxHealth);
|
||||
}
|
||||
@@ -775,7 +775,7 @@ index 2a71d5ac30c7bd57365002549f591c17bfb67d0e..19e4b5cade77922be60f707e14b787fa
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/Husk.java b/src/main/java/net/minecraft/world/entity/monster/Husk.java
|
||||
index 22daf7d11890a2e9276928ac9b242edf932e11cb..47e4f62d177c14ceffeb13a3fee5bfa342da7184 100644
|
||||
index 874e3a4adf3d4e688a240f29888ee0bbaaacc9dc..f1b4e28f5f42c19d2dc0c6f8ccfb542620e2629b 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Husk.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Husk.java
|
||||
@@ -62,6 +62,11 @@ public class Husk extends Zombie {
|
||||
@@ -791,7 +791,7 @@ index 22daf7d11890a2e9276928ac9b242edf932e11cb..47e4f62d177c14ceffeb13a3fee5bfa3
|
||||
|
||||
public static boolean checkHuskSpawnRules(EntityType<Husk> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource 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 01d7e41951d765bac9286adcf3f3196b954f8ff6..505afad75f771fe34300f7d09a8a60109a621efb 100644
|
||||
index a9c0989d23a11ea9273712aa0e98bf275376abef..2e6029afa8c045a99fb18ee1b7ffdb56b23dd6be 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
|
||||
@@ -81,6 +81,11 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
|
||||
@@ -807,7 +807,7 @@ index 01d7e41951d765bac9286adcf3f3196b954f8ff6..505afad75f771fe34300f7d09a8a6010
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
|
||||
index 01420d5dc03e67443291983f3c6e58340a44a37f..2b46e51abbc5bdf1a4d9b0faee693d41f41da161 100644
|
||||
index 9e73c3c79fcbbb17015f00cf300de3e5447c3c29..a53fe8bf4994ce146985930515c720673df45fe7 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
|
||||
@@ -65,6 +65,11 @@ public class MagmaCube extends Slime {
|
||||
@@ -823,7 +823,7 @@ index 01420d5dc03e67443291983f3c6e58340a44a37f..2b46e51abbc5bdf1a4d9b0faee693d41
|
||||
|
||||
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 600ebaaf72f830259eb8843cf96060b82fa00f1d..fa63050d50204e3af017e9cc1ab7eebd711d02b6 100644
|
||||
index 8929860dfe290782268c5fbce8a791b8f9d0af29..7b57ebb990fa304fa70e2ec9c35bf47df8b2b414 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
|
||||
@@ -151,6 +151,11 @@ public class Phantom extends FlyingMob implements Enemy {
|
||||
@@ -839,7 +839,7 @@ index 600ebaaf72f830259eb8843cf96060b82fa00f1d..fa63050d50204e3af017e9cc1ab7eebd
|
||||
|
||||
@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 f2f0137d8c74165f5ea829599f537c1425e4c872..ec2f96b3517bd99cbd616aee56d0b1c6f6247759 100644
|
||||
index f1eb424f1c4c15f777350603543bdf6613c97019..c260dfafd7579f1a15ca712ac43ad8752e5147d3 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Pillager.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
|
||||
@@ -82,6 +82,11 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
|
||||
@@ -855,7 +855,7 @@ index f2f0137d8c74165f5ea829599f537c1425e4c872..ec2f96b3517bd99cbd616aee56d0b1c6
|
||||
|
||||
@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 ef2fd3f55768be5534aa9fcacb3bd5841cfd6789..b1ef22e46db43f0c5b8bf3d2463850bba025d086 100644
|
||||
index af2eddeb3d4c4dcb1f6862b5aefd26c0964fef63..1c28e0f5b96114b2886fcf670ce5ce23526868f3 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
|
||||
@@ -91,6 +91,11 @@ public class Ravager extends Raider {
|
||||
@@ -871,7 +871,7 @@ index ef2fd3f55768be5534aa9fcacb3bd5841cfd6789..b1ef22e46db43f0c5b8bf3d2463850bb
|
||||
|
||||
@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 278e4d22e0a8fd7ff27df175fe46e11b3ec15534..41a6cd3a81c531b6349ca364b85712954a97aa11 100644
|
||||
index 8276c8cb76f36e99ec09c0cede5aeac90dfd11fb..cd0e0d15868bcefef28d801dbd2aa41ac982baac 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
|
||||
@@ -887,7 +887,7 @@ index 278e4d22e0a8fd7ff27df175fe46e11b3ec15534..41a6cd3a81c531b6349ca364b8571295
|
||||
|
||||
@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 42a340e5efcd44917dd0582a73a91c734b964a11..ca4f5eaebbb1ca0ff940665098e756afb4d2f0db 100644
|
||||
index 297733b3fdd354f0e837922c8c97f56a4bbf1830..f30d3b012d933efe880e75367a8d21aa03c40148 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
|
||||
@@ -62,6 +62,11 @@ public class Silverfish extends Monster {
|
||||
@@ -903,7 +903,7 @@ index 42a340e5efcd44917dd0582a73a91c734b964a11..ca4f5eaebbb1ca0ff940665098e756af
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
|
||||
index 6fb4649b5a0c87ef6906902ce533b24573e6fcde..53c5a66a538f00cdfa440e41b6dd2a912dbb1a37 100644
|
||||
index 46caa30dec30b62add4cdb41932f3268c07dac67..79c7f5c15748f0989c9167a06e6e7d0500f70460 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
|
||||
@@ -46,6 +46,11 @@ public class Skeleton extends AbstractSkeleton {
|
||||
@@ -919,7 +919,7 @@ index 6fb4649b5a0c87ef6906902ce533b24573e6fcde..53c5a66a538f00cdfa440e41b6dd2a91
|
||||
|
||||
@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 344386b3da76778f2758c4778e76755056e19501..752de9fdf475e6c5c395feb6ae82474fed14d880 100644
|
||||
index e99f6f6e4aa490eeaa95892ea61c972ca159425e..c44dfe6ea5d872b927597afc5e02477f181da012 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
|
||||
@@ -135,6 +135,11 @@ public class Slime extends Mob implements Enemy {
|
||||
@@ -935,7 +935,7 @@ index 344386b3da76778f2758c4778e76755056e19501..752de9fdf475e6c5c395feb6ae82474f
|
||||
|
||||
@Override
|
||||
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 669a0ee7661e972a169d8b550af1e5658c029474..a3066ac1c69df22e04b86c6d81e4df270a3ecff9 100644
|
||||
index e3d3690bb8cec0c610da7ddf781ebff165de418f..2b0de124a0b113bcbc90c0c82b67cdaeb46b9f55 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
|
||||
@@ -71,6 +71,11 @@ public class Spider extends Monster {
|
||||
@@ -951,7 +951,7 @@ index 669a0ee7661e972a169d8b550af1e5658c029474..a3066ac1c69df22e04b86c6d81e4df27
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/Stray.java b/src/main/java/net/minecraft/world/entity/monster/Stray.java
|
||||
index e7f0807cc4e57c99bbd0debaebb3b9f6243c591c..703d997e22ea24a93d054d72ca914f8a5a8cdc0a 100644
|
||||
index a0247b8e29aad13c2c6f90f686664cfae99c6acd..e259ca878a2312fe941f44667d05939dc871f20e 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Stray.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Stray.java
|
||||
@@ -41,6 +41,11 @@ public class Stray extends AbstractSkeleton {
|
||||
@@ -967,7 +967,7 @@ index e7f0807cc4e57c99bbd0debaebb3b9f6243c591c..703d997e22ea24a93d054d72ca914f8a
|
||||
|
||||
public static boolean checkStraySpawnRules(EntityType<Stray> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource 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 4ab0a053d6b3c8d57f6420114c649d2ec3a565fc..d20376eab4dc9d95acb5cd9dc8fa0f80965a65fd 100644
|
||||
index 7d10e81669177d0df5c6eba79a2aac46122daea6..97a94ee517021e07df3a4d69f8ae854cd993f784 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
|
||||
@@ -94,7 +94,7 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
|
||||
@@ -989,7 +989,7 @@ index 4ab0a053d6b3c8d57f6420114c649d2ec3a565fc..d20376eab4dc9d95acb5cd9dc8fa0f80
|
||||
|
||||
@Override
|
||||
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 5b5dd53181b18ad7c4af7f9381fd985dd54d2370..16e9f78c6a84f7be9d2f7185045680853a26da05 100644
|
||||
index cd2670bcffbf8c790d128ed312855a835cb70749..73773dc5eb0d21746ea31459b659767e88eedd72 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java
|
||||
@@ -110,6 +110,11 @@ public class Vex extends Monster implements TraceableEntity {
|
||||
@@ -1005,7 +1005,7 @@ index 5b5dd53181b18ad7c4af7f9381fd985dd54d2370..16e9f78c6a84f7be9d2f718504568085
|
||||
|
||||
@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 021550a0465dd1fd152b4c2e763014058730e8ca..b9b2e76535da32965615de563d4674cee4abd7f0 100644
|
||||
index 5e732fd80cd0ac814e56c741717e333500fcc334..2d2d01187d3fc6a17b3e98b5e5ab018d3af88af1 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
|
||||
@@ -78,6 +78,11 @@ public class Vindicator extends AbstractIllager {
|
||||
@@ -1021,7 +1021,7 @@ index 021550a0465dd1fd152b4c2e763014058730e8ca..b9b2e76535da32965615de563d4674ce
|
||||
|
||||
@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 dbfb46cc45d96b32f67869c796970c4c0e93202a..851ae9a93da64875a6102d185c6ba36e6c868044 100644
|
||||
index cf64f00c7a1528006d4946ad5d871cf487336745..2269d316c826f0dbe18ad9968c8fc04335db13fc 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
|
||||
@@ -77,6 +77,11 @@ public class Witch extends Raider implements RangedAttackMob {
|
||||
@@ -1037,7 +1037,7 @@ index dbfb46cc45d96b32f67869c796970c4c0e93202a..851ae9a93da64875a6102d185c6ba36e
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
|
||||
index b374069a1e88db67a56d6d5f9e05318c0403d462..dd47abc25f71ad019025e11bdf9f5ca97c2c78f3 100644
|
||||
index 259896608f947b1dd574192e5e4babce4bd7d7ff..09dab86cb43ebc66423c0a8b65ea6a8c28604b87 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
|
||||
@@ -55,6 +55,11 @@ public class WitherSkeleton extends AbstractSkeleton {
|
||||
@@ -1053,7 +1053,7 @@ index b374069a1e88db67a56d6d5f9e05318c0403d462..dd47abc25f71ad019025e11bdf9f5ca9
|
||||
|
||||
@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 1f4317160ca8b628640142a110d93ceb1c4ec421..e120d5c054585f539bdc086eb33d5eb0b4b07e57 100644
|
||||
index a0c39477f7a565307c95df7bf7616d58e6960d30..3715ff68d6c134d6f1cdf4a3e04db8a069bbf3b8 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
|
||||
@@ -87,6 +87,11 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
|
||||
@@ -1069,7 +1069,7 @@ index 1f4317160ca8b628640142a110d93ceb1c4ec421..e120d5c054585f539bdc086eb33d5eb0
|
||||
|
||||
@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 35e1e8264d9f1e30b37ad598adab478b4c99ada3..d0c2167c82da8b2e9e3222c4ebb50ef2e141b34f 100644
|
||||
index 0d4abed58cd14f7804e61c6e6a62891c71fb9f0a..390a31286e17173ec8f1e40b69b09bcdd6012f7d 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
|
||||
@@ -138,6 +138,11 @@ public class Zombie extends Monster {
|
||||
@@ -1085,7 +1085,7 @@ index 35e1e8264d9f1e30b37ad598adab478b4c99ada3..d0c2167c82da8b2e9e3222c4ebb50ef2
|
||||
|
||||
@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 24bd4b83b37e65606db9b371db458dcc4a16d419..cd1e454b1e178b5bb2c2a9b83bdab2b70206bde3 100644
|
||||
index 0f12e4ac6eab349418328a80a2b02fa27ce3f39b..1084adce8dc55b19ed9d90c0c5ad6675fff0afc5 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
|
||||
@@ -119,6 +119,11 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
|
||||
@@ -1101,7 +1101,7 @@ index 24bd4b83b37e65606db9b371db458dcc4a16d419..cd1e454b1e178b5bb2c2a9b83bdab2b7
|
||||
|
||||
@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 2ff0166a26ede86e8410b003a5e7f051559dd05d..45ed7baaf5cbb3c368bc0051462bfba35c5d6726 100644
|
||||
index 65d035647f7caf23647ec00beb20a4a27d1a9a55..426dbf4f78ce6d731313a45380fd23cdeb91efb1 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
|
||||
@@ -98,6 +98,11 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
|
||||
@@ -1117,7 +1117,7 @@ index 2ff0166a26ede86e8410b003a5e7f051559dd05d..45ed7baaf5cbb3c368bc0051462bfba3
|
||||
|
||||
@Override
|
||||
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 f442c8457a9efd47311cb3a2594112c820de8902..7db4cacb490f8fb942ead1bd6e22c19a938b2656 100644
|
||||
index 8e837ce3069ca05bcc93ea93f94c79342ea9eb3c..48d25e6015b9419a4f6d0f81877af2dcc9d91023 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
|
||||
@@ -92,6 +92,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
|
||||
@@ -1133,7 +1133,7 @@ index f442c8457a9efd47311cb3a2594112c820de8902..7db4cacb490f8fb942ead1bd6e22c19a
|
||||
|
||||
@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 a7f0553eb11f7100152c332ac270b9206e7ee89e..e605d47332461d39960c5b9b29ef88873068508c 100644
|
||||
index 8d7a65f452018ca0d7f58661aea251ebf96906d6..b6d10dd654d2890464802faf0752816b4ac35e1c 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
|
||||
@@ -117,6 +117,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
|
||||
@@ -1149,7 +1149,7 @@ index a7f0553eb11f7100152c332ac270b9206e7ee89e..e605d47332461d39960c5b9b29ef8887
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
|
||||
index 75db61c5aab66234b26f7899229ddca8896e2086..a44f9a59fbec146df95d89c26df12efb79f6179a 100644
|
||||
index b931880d8cda19bc042bacc98a6a5fead9d54303..fd8f5ef1842eaa8676893fcd53f550ab5ccb3b93 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
|
||||
@@ -61,6 +61,11 @@ public class PiglinBrute extends AbstractPiglin {
|
||||
@@ -1165,7 +1165,7 @@ index 75db61c5aab66234b26f7899229ddca8896e2086..a44f9a59fbec146df95d89c26df12efb
|
||||
|
||||
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 b1b6013c6499cc734c9b1d67e81511e3b51193af..b76320dc4a6c438b963380bba3fe26dcc181588b 100644
|
||||
index c5651a1c4ece3bf911401533e41be7c92455d5dc..937105ae414c0ef809b79300a1a932053d1c1a14 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
||||
@@ -184,6 +184,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
|
||||
@@ -1181,7 +1181,7 @@ index b1b6013c6499cc734c9b1d67e81511e3b51193af..b76320dc4a6c438b963380bba3fe26dc
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
|
||||
index 347c58d8f616d1bfe1c669809465cc37983db6e6..c3bf2f1fac8326fda97360587f59bc1163b26e38 100644
|
||||
index fbbeacb94aeda40e9fc5c0553ab68948de9019c4..64c8890a54a10abd454a62671fbabfcf9720b7c0 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
|
||||
@@ -94,6 +94,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
|
||||
|
||||
@@ -5,10 +5,10 @@ Subject: [PATCH] Configs for if Wither/Ender Dragon can ride vehicles
|
||||
|
||||
|
||||
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 567f30840947d5f44a15321694799534bd015da8..7c0d7aa465b2a04aa4808d2346ea4eb5c6ae47e4 100644
|
||||
index 7ec5da61a57e38146840c6b387104ed6716c24d4..c5346f06175846aecbf30f9bea28be3b0fdb6397 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
|
||||
@@ -1155,6 +1155,7 @@ public class EnderDragon extends Mob implements Enemy {
|
||||
@@ -1154,6 +1154,7 @@ public class EnderDragon extends Mob implements Enemy {
|
||||
|
||||
@Override
|
||||
protected boolean canRide(Entity entity) {
|
||||
@@ -17,7 +17,7 @@ index 567f30840947d5f44a15321694799534bd015da8..7c0d7aa465b2a04aa4808d2346ea4eb5
|
||||
}
|
||||
|
||||
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 7c104e25bebef36fb24adfdb8956da4522fdc9e9..ed6bd1db6df635d0653b1573d62759e8fc752c45 100644
|
||||
index 0c329f66d0a26b881ddddf4c555850f6ce0481bc..2a4dce1a5ffa3902a50044b14e6c02b3781138bd 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
|
||||
@@ -742,6 +742,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
|
||||
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Dolphins naturally aggressive to players chance
|
||||
|
||||
|
||||
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 238556dfd610ca01666ff316af82f2890cf486b4..a24bbbf5c33ba74e8115abc9829640c107263a17 100644
|
||||
index f8d3a5d2dc254501c7e4405444ed4439f9af915e..c038a23c4e19c5bf160792cf599acc8f66a7d571 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
|
||||
@@ -79,6 +79,7 @@ public class Dolphin extends WaterAnimal {
|
||||
@@ -16,7 +16,7 @@ index 238556dfd610ca01666ff316af82f2890cf486b4..a24bbbf5c33ba74e8115abc9829640c1
|
||||
|
||||
public Dolphin(EntityType<? extends Dolphin> type, Level world) {
|
||||
super(type, world);
|
||||
@@ -174,6 +175,7 @@ public class Dolphin extends WaterAnimal {
|
||||
@@ -169,6 +170,7 @@ public class Dolphin extends WaterAnimal {
|
||||
public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData, @Nullable CompoundTag entityNbt) {
|
||||
this.setAirSupply(this.getMaxAirSupply());
|
||||
this.setXRot(0.0F);
|
||||
@@ -24,7 +24,7 @@ index 238556dfd610ca01666ff316af82f2890cf486b4..a24bbbf5c33ba74e8115abc9829640c1
|
||||
return super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityNbt);
|
||||
}
|
||||
|
||||
@@ -244,18 +246,20 @@ public class Dolphin extends WaterAnimal {
|
||||
@@ -239,18 +241,20 @@ public class Dolphin extends WaterAnimal {
|
||||
this.goalSelector.addGoal(0, new BreathAirGoal(this));
|
||||
this.goalSelector.addGoal(0, new TryFindWaterGoal(this));
|
||||
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
|
||||
|
||||
@@ -5,10 +5,10 @@ Subject: [PATCH] Mobs always drop experience
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
|
||||
index 506632a6b5107f5ef08cd87808b8c4be1e96b49f..b7abcaa32341c292f9f884fa6319fd65596e1b37 100644
|
||||
index 7d5b34f69c3ceed3c350ae641eef87cc64c88b43..c2309434b4d48a44587590623ac98dbf997b9578 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
|
||||
@@ -53,6 +53,11 @@ public class GlowSquid extends Squid {
|
||||
@@ -49,6 +49,11 @@ public class GlowSquid extends Squid {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.glowSquidTakeDamageFromWater;
|
||||
}
|
||||
@@ -21,7 +21,7 @@ index 506632a6b5107f5ef08cd87808b8c4be1e96b49f..b7abcaa32341c292f9f884fa6319fd65
|
||||
|
||||
@Override
|
||||
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 68878b236a21a6fec7cbea0eec8e602188bc774e..ead2d12a8f86093d50ecd8c7f42e43fde01429bd 100644
|
||||
index 3541479dac8404b9c2ec3788cd521aec3fae7c24..7ddfc5a378842a4e5d45484c2608d4a260eac5be 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
|
||||
@@ -110,6 +110,11 @@ public class Bat extends AmbientCreature {
|
||||
@@ -37,7 +37,7 @@ index 68878b236a21a6fec7cbea0eec8e602188bc774e..ead2d12a8f86093d50ecd8c7f42e43fd
|
||||
|
||||
@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 575dbcf7a5399d7c9067b02337b1dbe294772109..2c3967d2b9d3e7999def21af521bfc443f50c02f 100644
|
||||
index 9d087295d63115d9b916e052b419789c0aa9fc63..d87b3bca72d4e4866d41053b47adb96555851b3a 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
|
||||
@@ -229,6 +229,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
|
||||
@@ -53,7 +53,7 @@ index 575dbcf7a5399d7c9067b02337b1dbe294772109..2c3967d2b9d3e7999def21af521bfc44
|
||||
|
||||
@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 05edeb6da8181aa7e2d01d64bc5fbb8993f35c2f..b459cdcd15aeda79b294946270b3175bff1d6b81 100644
|
||||
index 029b94287acc5b79662aabe8c9783ac823abd7d1..e4a29dd80b85401be54a9be70be26cd782e4f372 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
|
||||
@@ -135,6 +135,11 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
|
||||
@@ -69,7 +69,7 @@ index 05edeb6da8181aa7e2d01d64bc5fbb8993f35c2f..b459cdcd15aeda79b294946270b3175b
|
||||
|
||||
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 2d17d02a9efee54f4e7456088eaee416253d235d..b784ed135babe93119bc250c53bc2d771300559d 100644
|
||||
index ea35213552ed5b799d3b7aef225383f030fcb07a..215aa4aa0693b897e8c51d5c8ecb2dfb71342da0 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
|
||||
@@ -87,6 +87,11 @@ public class Chicken extends Animal {
|
||||
@@ -85,10 +85,10 @@ index 2d17d02a9efee54f4e7456088eaee416253d235d..b784ed135babe93119bc250c53bc2d77
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/Cod.java b/src/main/java/net/minecraft/world/entity/animal/Cod.java
|
||||
index 5b79d821e8b55c8876eadcbe811a2c0584e7e02b..de70208403ef6c6c9c82ca4c1fd3b641a40bb45c 100644
|
||||
index abd24e7434712e806a14dc0e708a76aa03ba258f..2a45b487e5305e7c40cc8de4ddbb142af4b041de 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Cod.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Cod.java
|
||||
@@ -38,6 +38,11 @@ public class Cod extends AbstractSchoolingFish {
|
||||
@@ -33,6 +33,11 @@ public class Cod extends AbstractSchoolingFish {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.codTakeDamageFromWater;
|
||||
}
|
||||
@@ -101,7 +101,7 @@ index 5b79d821e8b55c8876eadcbe811a2c0584e7e02b..de70208403ef6c6c9c82ca4c1fd3b641
|
||||
|
||||
@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 7bf4b399d68b04a43465e85061113249d7ecf0d3..35b97e48b19fad137cab03e3599e4c81101eb87a 100644
|
||||
index 17c94ffb73b6bc2fbf7b700934a0eb01e117756a..fa29b8b22d49f094e3a2d37961238505efb94ded 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
|
||||
@@ -81,6 +81,11 @@ public class Cow extends Animal {
|
||||
@@ -117,10 +117,10 @@ index 7bf4b399d68b04a43465e85061113249d7ecf0d3..35b97e48b19fad137cab03e3599e4c81
|
||||
|
||||
@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 a24bbbf5c33ba74e8115abc9829640c107263a17..7ea524859accce4044d7f10127bce95f2fa07adb 100644
|
||||
index c038a23c4e19c5bf160792cf599acc8f66a7d571..a077edbe97ce89e11a26fe3ebeb0bdd996593f78 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
|
||||
@@ -168,6 +168,11 @@ public class Dolphin extends WaterAnimal {
|
||||
@@ -163,6 +163,11 @@ public class Dolphin extends WaterAnimal {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.dolphinTakeDamageFromWater;
|
||||
}
|
||||
@@ -133,7 +133,7 @@ index a24bbbf5c33ba74e8115abc9829640c107263a17..7ea524859accce4044d7f10127bce95f
|
||||
|
||||
@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 1d030dcf8df462bd21e73172218948086a621a6f..abbb58b69e51338144565a01d31fdad554bbad24 100644
|
||||
index bf3166a50930044cc329142670a2f1e77f144e4b..75faaa40cb88d12091113a930011ecf8d345272a 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
||||
@@ -194,6 +194,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
|
||||
@@ -149,7 +149,7 @@ index 1d030dcf8df462bd21e73172218948086a621a6f..abbb58b69e51338144565a01d31fdad5
|
||||
|
||||
@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 c6438bccfbc0b3b5086d493f3d6630b47b0eec38..a119b5cac9669c40413188c8c5020c8a6041aa96 100644
|
||||
index 42c2f0794ff72cf5c9bbff5acd0f9b255d787cb1..da27165083142d2d529f12f8da64341450567cc6 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
|
||||
@@ -104,6 +104,11 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
|
||||
@@ -165,7 +165,7 @@ index c6438bccfbc0b3b5086d493f3d6630b47b0eec38..a119b5cac9669c40413188c8c5020c8a
|
||||
|
||||
@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 4973a0da1139bec25d4b9bf16a01934f276f4805..f517658a240a7c79889f9047e94e9afc884df78c 100644
|
||||
index 7bafba53b6c4947a37c02a1f616b8fe74ce4d99b..ce77010be2fa34e1e9272a3c202ca6167500a09b 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
|
||||
@@ -93,6 +93,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
|
||||
@@ -181,7 +181,7 @@ index 4973a0da1139bec25d4b9bf16a01934f276f4805..f517658a240a7c79889f9047e94e9afc
|
||||
|
||||
@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 72a1f8ecac740b428f35cdcec469bc592d267259..354a5a3dc3043a7cf67f6cd299898803bd5f2de9 100644
|
||||
index d03465ab53d32b967d2077c4759062ab777a3cd2..8c766b41f49d665c697c7ffbe27d08c8e5c4b8fe 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
|
||||
@@ -98,6 +98,11 @@ public class Ocelot extends Animal {
|
||||
@@ -197,7 +197,7 @@ index 72a1f8ecac740b428f35cdcec469bc592d267259..354a5a3dc3043a7cf67f6cd299898803
|
||||
|
||||
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 837072686b4fac2e3217390ed276c1a508321e0f..841838562ffed67127b03e27f61d692d9933fbe3 100644
|
||||
index 25e7c75a8319fd17d6e41db75a746778331f22d8..e5832d8e99ac14a1c9bd5ffb3fd3071571491ab1 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
||||
@@ -148,6 +148,11 @@ public class Panda extends Animal {
|
||||
@@ -213,7 +213,7 @@ index 837072686b4fac2e3217390ed276c1a508321e0f..841838562ffed67127b03e27f61d692d
|
||||
|
||||
@Override
|
||||
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 6c57b093366019f78627f75bab2d710c6556c030..9fe40841b9b15202755fa109b1ae88fd238766ad 100644
|
||||
index 629ced06cc17ebd6a359b74858d073e12c6a3b88..e10871c6a6d99ff8860a536cab53af493e69ffda 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
|
||||
@@ -204,6 +204,11 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
|
||||
@@ -229,7 +229,7 @@ index 6c57b093366019f78627f75bab2d710c6556c030..9fe40841b9b15202755fa109b1ae88fd
|
||||
|
||||
@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 9d2689bd264343a3d34904ca01b5e0d0c029e7e9..0ec19e140ce64557ecff4b270981461d3700c091 100644
|
||||
index df5e9e79d30993c362cac3f45c1a7a56b6c095de..d3d8e00e20bbd9d9692fe35b84e5bc3ad0cbf525 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
|
||||
@@ -94,6 +94,11 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
|
||||
@@ -245,7 +245,7 @@ index 9d2689bd264343a3d34904ca01b5e0d0c029e7e9..0ec19e140ce64557ecff4b270981461d
|
||||
|
||||
@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 76fbb48bdbd23117aad53f30244425d865841486..5bf99f3b9fea87374d9747ae4f96a02b030f7c7a 100644
|
||||
index f7f326a29255e3c03b36cbdf1630054ba5fd8be4..95ffaf28e44032dc696bf7f019c1135386d9ce06 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
|
||||
@@ -128,6 +128,11 @@ public class PolarBear extends Animal implements NeutralMob {
|
||||
@@ -261,10 +261,10 @@ index 76fbb48bdbd23117aad53f30244425d865841486..5bf99f3b9fea87374d9747ae4f96a02b
|
||||
|
||||
@Nullable
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
|
||||
index 1754f328f676a3545b1a1fd2d944ac4be7fff70b..de0e7016adf8f34788865b479fcff1c83023bd3e 100644
|
||||
index 76e2470fd7c8232ed699cb4ece9d0f73743914b6..d152c50f17e2ab7a37b0c295c7f62e63889b8b76 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
|
||||
@@ -70,6 +70,11 @@ public class Pufferfish extends AbstractFish {
|
||||
@@ -65,6 +65,11 @@ public class Pufferfish extends AbstractFish {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.pufferfishTakeDamageFromWater;
|
||||
}
|
||||
@@ -277,7 +277,7 @@ index 1754f328f676a3545b1a1fd2d944ac4be7fff70b..de0e7016adf8f34788865b479fcff1c8
|
||||
|
||||
@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 3425ccad431c41d878586dae7d606a8e6c0dc3a8..592312efa3de65988f18896ab7526d8c9ca74658 100644
|
||||
index 3cc7460f82e0956c9340891987209eabe0b6a97a..a9f05181fe391703bb78f2ec8fdcb7c3a63de5b6 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
|
||||
@@ -150,6 +150,11 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
|
||||
@@ -293,10 +293,10 @@ index 3425ccad431c41d878586dae7d606a8e6c0dc3a8..592312efa3de65988f18896ab7526d8c
|
||||
|
||||
// CraftBukkit start - code from constructor
|
||||
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 16171814bab7fbc0c177323cc5f8b026c8ebbcd4..bd1e964c7899a54a2c39afe0691a7573cfe35fc1 100644
|
||||
index cea2f9b5760d82f244950e27ca6f4baed78ec01c..e0da8d1974f88e1426034620f78a29f9bdb5adf4 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Salmon.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Salmon.java
|
||||
@@ -38,6 +38,11 @@ public class Salmon extends AbstractSchoolingFish {
|
||||
@@ -33,6 +33,11 @@ public class Salmon extends AbstractSchoolingFish {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.salmonTakeDamageFromWater;
|
||||
}
|
||||
@@ -309,7 +309,7 @@ index 16171814bab7fbc0c177323cc5f8b026c8ebbcd4..bd1e964c7899a54a2c39afe0691a7573
|
||||
|
||||
@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 5448b2a5658137f723a5ea3d1d5387fce566e7a0..411fa176dd1b6368437da593140204fdec7721f8 100644
|
||||
index 14c59e94040a5bcf07e7a134c4a1a0f4453d386a..507526b0961f0f22f6ac67d60bb1de039d1ccf10 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
|
||||
@@ -146,6 +146,11 @@ public class Sheep extends Animal implements Shearable {
|
||||
@@ -325,7 +325,7 @@ index 5448b2a5658137f723a5ea3d1d5387fce566e7a0..411fa176dd1b6368437da593140204fd
|
||||
|
||||
@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 983b37b9c158a1520ca1a54a43af7c1d016d5e35..6831fd4d74358ea152444f154b6e567d368bbf46 100644
|
||||
index f9accd0794e8ae078db6b676e9e4fa96c75b6d7e..39acce573f6c9885f52155eab9af263fde537d01 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
|
||||
@@ -84,6 +84,11 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
|
||||
@@ -341,10 +341,10 @@ index 983b37b9c158a1520ca1a54a43af7c1d016d5e35..6831fd4d74358ea152444f154b6e567d
|
||||
|
||||
@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 480e577512a84bcb7749012bc5655f90dfb10be4..802afd3dc36bc9be97b39d20288dec3c6ed496eb 100644
|
||||
index f8eef39f269ede559fb5fd4db631f2fb5dadc995..2a2b56940cd39ca0f14dc8246b41cf6640caa3bd 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
|
||||
@@ -100,6 +100,11 @@ public class Squid extends WaterAnimal {
|
||||
@@ -95,6 +95,11 @@ public class Squid extends WaterAnimal {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.squidTakeDamageFromWater;
|
||||
}
|
||||
@@ -357,10 +357,10 @@ index 480e577512a84bcb7749012bc5655f90dfb10be4..802afd3dc36bc9be97b39d20288dec3c
|
||||
|
||||
@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 220a9ca9c78b14b4ca6f76192396db608db184b8..a3becf90c3309d52d2701c016d4c16970a318f9c 100644
|
||||
index ce5fd177521780176708fd0b97f1d57cbd5cb1e4..e4b4bf5ef228c0460fdab966d4c9b5c428f78b9a 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
|
||||
@@ -67,6 +67,11 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
|
||||
@@ -62,6 +62,11 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.tropicalFishTakeDamageFromWater;
|
||||
}
|
||||
@@ -373,7 +373,7 @@ index 220a9ca9c78b14b4ca6f76192396db608db184b8..a3becf90c3309d52d2701c016d4c1697
|
||||
|
||||
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 fcc2daf21dfedcee1bf58427d238b929f18082da..2d709000d7d6f97b316483fd7de6f19d346119cd 100644
|
||||
index edcc61a3c2318e5d86486615d36d9eae7327796f..870ee6916548621764e3d8b3aa22e71d117bc11d 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
|
||||
@@ -113,6 +113,11 @@ public class Turtle extends Animal {
|
||||
@@ -389,7 +389,7 @@ index fcc2daf21dfedcee1bf58427d238b929f18082da..2d709000d7d6f97b316483fd7de6f19d
|
||||
|
||||
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 72b3c31809c09fe0e297bbfc50ed82b070d215da..53b757c41f347fc6601afb84f9384391201d978d 100644
|
||||
index 5cf066e8a4b1b0b3b68f734dfbfb97ef3f98d205..014f1913a0c358fe51fded46e81ac3549dba92cf 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
||||
@@ -212,6 +212,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
|
||||
@@ -405,10 +405,10 @@ index 72b3c31809c09fe0e297bbfc50ed82b070d215da..53b757c41f347fc6601afb84f9384391
|
||||
|
||||
@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 d173718dbaf8519c76e9347e5c53efa29c46c798..f931b6fde9e40473bacbe04bc72e00288f00e4eb 100644
|
||||
index 5e705c84e5deeb3b3bdede80bf2acd9a252e3972..d61d9a7e7fa4d360dc740fdcb31efd028452fe61 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
|
||||
@@ -133,6 +133,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
|
||||
@@ -128,6 +128,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.axolotlTakeDamageFromWater;
|
||||
}
|
||||
@@ -421,7 +421,7 @@ index d173718dbaf8519c76e9347e5c53efa29c46c798..f931b6fde9e40473bacbe04bc72e0028
|
||||
|
||||
@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 2c09ac502c1814eab6fa142f97f1332c407900d7..9e1e1a7d0fc58d70e3566acc78e27b825ddd8ab8 100644
|
||||
index 85d08932d2941f2e75d2449d1a7a6223d529e295..9d813827c27823c2e01341330cda1a64c4cdd315 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
|
||||
@@ -119,6 +119,11 @@ public class Goat extends Animal {
|
||||
@@ -437,7 +437,7 @@ index 2c09ac502c1814eab6fa142f97f1332c407900d7..9e1e1a7d0fc58d70e3566acc78e27b82
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
|
||||
index 7f54981b741874cbbf4748b03d31ef2ef11f99b1..db56ad11133fb1c3ec33f8d05421184b86174762 100644
|
||||
index c71127d7adb24a1bd14641b79839666412d08662..bdf6078b6cc8409a664ac1ae387a2738f56378b5 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
|
||||
@@ -45,6 +45,11 @@ public class Donkey extends AbstractChestedHorse {
|
||||
@@ -453,7 +453,7 @@ index 7f54981b741874cbbf4748b03d31ef2ef11f99b1..db56ad11133fb1c3ec33f8d05421184b
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
|
||||
index d27b7e160ae2b9eb2d709b875fdaae6c212707a1..dbe8b31f855ba1d2b5ec056774d3bec1ff4568ad 100644
|
||||
index 22f8d501e2dfb765f0cf3f199efed7c5b1067581..b737eb9d32b3a460d0832155b8c64faf1ebb44f1 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
|
||||
@@ -70,6 +70,11 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
|
||||
@@ -469,7 +469,7 @@ index d27b7e160ae2b9eb2d709b875fdaae6c212707a1..dbe8b31f855ba1d2b5ec056774d3bec1
|
||||
|
||||
@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 c8d3f2ffb0f4d5586921421cda8acf27f7afe4b8..beea0545a38b0f044409c2cdb5bbefaf8d783d45 100644
|
||||
index 670a78292aa069b4e37eb1b46089e9f907f0a440..0b06ef5537cf781b9954fcdfc9423f1987cb5674 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
|
||||
@@ -146,6 +146,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
|
||||
@@ -485,7 +485,7 @@ index c8d3f2ffb0f4d5586921421cda8acf27f7afe4b8..beea0545a38b0f044409c2cdb5bbefaf
|
||||
|
||||
public boolean isTraderLlama() {
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
|
||||
index 2a44b6cfcbfe484d4267add53b35b07c069a64a9..c5b1b023f39f8e4bff5a5e816e185247f7d626a6 100644
|
||||
index 32ade7ae57c5fe598e51c8f2d805b280f00e8a2e..b7cb49c03fc8ae655d3c596c872f988e7c863cf6 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
|
||||
@@ -44,6 +44,11 @@ public class Mule extends AbstractChestedHorse {
|
||||
@@ -517,7 +517,7 @@ index a0a28c3d682bd96ac65151293fb8429de42c905c..9ed43b3cb5b60e80387fc39caa9cc471
|
||||
|
||||
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 ad5adf8905445ff1aac63827f13cb256889fc67e..b315bcd383598f7be371feed459da962c13a55f2 100644
|
||||
index 02b6f2ce6831eb68442d1a4b47764426830dedb5..71f61ffc206eb6c098978bfc4e36944e61c4e320 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
|
||||
@@ -72,6 +72,11 @@ public class TraderLlama extends Llama {
|
||||
@@ -533,7 +533,7 @@ index ad5adf8905445ff1aac63827f13cb256889fc67e..b315bcd383598f7be371feed459da962
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
|
||||
index e833f8bdf6e09e6701137650bffd44cdecb3044e..6bb357c2f7ee4d43e3e7d74ad594e7d996624401 100644
|
||||
index a3e33c2a7bbabc0e295c5ed93ca6030b39b10efb..bf97ed859e178a1028de413eb136fdeb40fac8ef 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
|
||||
@@ -56,6 +56,11 @@ public class ZombieHorse extends AbstractHorse {
|
||||
@@ -549,7 +549,7 @@ index e833f8bdf6e09e6701137650bffd44cdecb3044e..6bb357c2f7ee4d43e3e7d74ad594e7d9
|
||||
|
||||
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 f23a43b5bf5cc45f96d2e62bd3fdff8c6bbf38b2..8ee056c7c58f4793f70d41a9074fb6230c1703df 100644
|
||||
index 588ff25c19f7c0acc627f2d8425dbae56193bf85..7bfa5eed5a723d1887bec0ac5ca3822cffdfe0fa 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
|
||||
@@ -249,6 +249,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
|
||||
@@ -565,7 +565,7 @@ index f23a43b5bf5cc45f96d2e62bd3fdff8c6bbf38b2..8ee056c7c58f4793f70d41a9074fb623
|
||||
|
||||
@Override
|
||||
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 c09752090d51731f1c3d30ecfc0e28b138fc419c..9b4baca20deb1f331b7c1f08bcb935a607ba1b94 100644
|
||||
index ebdc03f76700ed25d4247fb96e0abfae8a613cd6..e7140fe986f1b612c50c67314b9f57c75fce8e9a 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Blaze.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
|
||||
@@ -77,6 +77,11 @@ public class Blaze extends Monster {
|
||||
@@ -581,7 +581,7 @@ index c09752090d51731f1c3d30ecfc0e28b138fc419c..9b4baca20deb1f331b7c1f08bcb935a6
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
|
||||
index 5347ba12f2a07601c9f044081e5e6ce6472c4a2a..0ac5264a16c9121c0f6233e83c426199784fe4c9 100644
|
||||
index 66e3af15c3921facff28bbf9ecef2f919a5be6b3..9e7a45d3c8f6f92244810adceabbedbd8764508f 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
|
||||
@@ -53,6 +53,11 @@ public class CaveSpider extends Spider {
|
||||
@@ -597,7 +597,7 @@ index 5347ba12f2a07601c9f044081e5e6ce6472c4a2a..0ac5264a16c9121c0f6233e83c426199
|
||||
|
||||
@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 415f5fc5c6b1f780a28917c21d0856ee598c59fc..db7bf22a15a02e3ba5bdf8d794c0aa897edcc0e5 100644
|
||||
index 30df0e74950c6629fce06923a4a7d57341606fd6..a95209da6c2b17c22d51f5520adfebfa0ab3a5b5 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
|
||||
@@ -164,6 +164,11 @@ public class Creeper extends Monster implements PowerableMob {
|
||||
@@ -613,7 +613,7 @@ index 415f5fc5c6b1f780a28917c21d0856ee598c59fc..db7bf22a15a02e3ba5bdf8d794c0aa89
|
||||
|
||||
@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 d1f5b3900dbb17d262fea85c45a82ba3a2f46cad..8cee711458e8db224dd149777c2bc1f89eed3782 100644
|
||||
index feef31edb1833da45c42b73894f610ac3add7c8e..21b63bd8fa7bc903f587940a28b15f654900a755 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
|
||||
@@ -114,6 +114,11 @@ public class Drowned extends Zombie implements RangedAttackMob {
|
||||
@@ -629,10 +629,10 @@ index d1f5b3900dbb17d262fea85c45a82ba3a2f46cad..8cee711458e8db224dd149777c2bc1f8
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
|
||||
index 64193dab104b735a9fa3b335774e662629110c79..3533414fcb112b75df7226d32b220bfcd6bd869f 100644
|
||||
index 0217eebab2bac9f647ec00888190fafb7c741497..916cf5137808003058a787210fc3343d75caf3d9 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
|
||||
@@ -58,6 +58,11 @@ public class ElderGuardian extends Guardian {
|
||||
@@ -53,6 +53,11 @@ public class ElderGuardian extends Guardian {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.elderGuardianTakeDamageFromWater;
|
||||
}
|
||||
@@ -645,7 +645,7 @@ index 64193dab104b735a9fa3b335774e662629110c79..3533414fcb112b75df7226d32b220bfc
|
||||
|
||||
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 5e2b7b4caf6d6d823943e2d56288758265f0d506..4a96b0abd4de2fb8c3df54b6114976fbc79fe389 100644
|
||||
index 7b6287231131fb39a8bab756f7fda3c9edded93d..8accf3abb5ba38faad29bd7d7e1a594d9ba6ced2 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
|
||||
@@ -112,6 +112,11 @@ public class EnderMan extends Monster implements NeutralMob {
|
||||
@@ -661,7 +661,7 @@ index 5e2b7b4caf6d6d823943e2d56288758265f0d506..4a96b0abd4de2fb8c3df54b6114976fb
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/Endermite.java b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
|
||||
index 195bcfee5961bb69f98532a15f625593b04321cc..c8696832f16e6c4a106befde471ef032bc40c891 100644
|
||||
index c9b1b5f74423f40e89ef487449139ebbaedb39d0..2bb73bdc917bf5077c0084e4f3e638decfc05a8c 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
|
||||
@@ -71,6 +71,11 @@ public class Endermite extends Monster {
|
||||
@@ -677,7 +677,7 @@ index 195bcfee5961bb69f98532a15f625593b04321cc..c8696832f16e6c4a106befde471ef032
|
||||
|
||||
@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 770e6abab4ae2d7c25e9b0d621f3a07de920c8d8..c766b2800c5d1cb3321b5542a90128b3afb09371 100644
|
||||
index ea29765ac38565ab54f3bc9a9d2f36e3ee4700ac..a7ae8f4e6f37114c0adf02d2b80cac1544ab5677 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
|
||||
@@ -73,6 +73,11 @@ public class Evoker extends SpellcasterIllager {
|
||||
@@ -693,7 +693,7 @@ index 770e6abab4ae2d7c25e9b0d621f3a07de920c8d8..c766b2800c5d1cb3321b5542a90128b3
|
||||
|
||||
@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 8ab5dfd2f56d52b275bf160d8a28adce5564a5f2..225a4e549c2cbf64beaba52d26b196af5b868433 100644
|
||||
index 75efaca73593446d41e0b2d31bcc76b2693248d8..db7d67ce0366ce5e4eb3b5af3092be0c2e6d839f 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
|
||||
@@ -86,6 +86,11 @@ public class Ghast extends FlyingMob implements Enemy {
|
||||
@@ -709,7 +709,7 @@ index 8ab5dfd2f56d52b275bf160d8a28adce5564a5f2..225a4e549c2cbf64beaba52d26b196af
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java
|
||||
index 148ad9bc34793e6ed2b4b02aff6f239321504268..2511ca42039fa91483a316ae13bb7da54f312f13 100644
|
||||
index a6c2a34e41b01c40596455d07b5425f939b8c515..2e535aef221c7d280ae3d8b235ccbb70262a750c 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Giant.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java
|
||||
@@ -112,6 +112,11 @@ public class Giant extends Monster {
|
||||
@@ -725,10 +725,10 @@ index 148ad9bc34793e6ed2b4b02aff6f239321504268..2511ca42039fa91483a316ae13bb7da5
|
||||
|
||||
@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 19e4b5cade77922be60f707e14b787faad684d61..5e15d5d038222c31de9d682a0dad2a841fe7e7e8 100644
|
||||
index 52d4a0975b1fec03fdd51b8fad8127a79e216be0..73e973e10f767d0efe0e0410d97c6892c4ea35d8 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Guardian.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
|
||||
@@ -104,6 +104,11 @@ public class Guardian extends Monster {
|
||||
@@ -99,6 +99,11 @@ public class Guardian extends Monster {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.guardianTakeDamageFromWater;
|
||||
}
|
||||
@@ -741,7 +741,7 @@ index 19e4b5cade77922be60f707e14b787faad684d61..5e15d5d038222c31de9d682a0dad2a84
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/Husk.java b/src/main/java/net/minecraft/world/entity/monster/Husk.java
|
||||
index bcbce83f9e304809fb946f80c9dd32c4a17a7afb..c865717f915f1bf27a07e09215322bdc6df7e909 100644
|
||||
index de5bb8a7a0184d03223cbfe47b72c7fcc895ef7f..2f81b6ae2e30557d54da60205a3fa6eccb6e10f6 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Husk.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Husk.java
|
||||
@@ -68,6 +68,11 @@ public class Husk extends Zombie {
|
||||
@@ -757,7 +757,7 @@ index bcbce83f9e304809fb946f80c9dd32c4a17a7afb..c865717f915f1bf27a07e09215322bdc
|
||||
|
||||
public static boolean checkHuskSpawnRules(EntityType<Husk> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource 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 505afad75f771fe34300f7d09a8a60109a621efb..e5a7b54a9d6e3d34e554c60c4a7b62ab867e64c8 100644
|
||||
index 2e6029afa8c045a99fb18ee1b7ffdb56b23dd6be..d8e3937731cd85c10a12cc4b509f58736e4874cf 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
|
||||
@@ -86,6 +86,11 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
|
||||
@@ -773,7 +773,7 @@ index 505afad75f771fe34300f7d09a8a60109a621efb..e5a7b54a9d6e3d34e554c60c4a7b62ab
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
|
||||
index 2b46e51abbc5bdf1a4d9b0faee693d41f41da161..e9c32e87558296548439a17e509839d95833b5db 100644
|
||||
index a53fe8bf4994ce146985930515c720673df45fe7..c7e1afa12fbf43a42b429cf7f935c81e28403678 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
|
||||
@@ -70,6 +70,11 @@ public class MagmaCube extends Slime {
|
||||
@@ -789,7 +789,7 @@ index 2b46e51abbc5bdf1a4d9b0faee693d41f41da161..e9c32e87558296548439a17e509839d9
|
||||
|
||||
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 de556c7c680005d1e6d233307b0d143d2321cb76..f7a6ed9f9fd0c76222beffff0748261020aa4fd4 100644
|
||||
index 23406c730243cdbc7467858d68d44d5376cf9a02..7b1c6aebc7d3327a1ad35b936a017b5eeaff8d99 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
|
||||
@@ -157,6 +157,11 @@ public class Phantom extends FlyingMob implements Enemy {
|
||||
@@ -805,7 +805,7 @@ index de556c7c680005d1e6d233307b0d143d2321cb76..f7a6ed9f9fd0c76222beffff07482610
|
||||
|
||||
@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 ec2f96b3517bd99cbd616aee56d0b1c6f6247759..1d4fed01ee94678e04962df0f086f53edf3f43a4 100644
|
||||
index c260dfafd7579f1a15ca712ac43ad8752e5147d3..34a36bafc46b7ceba0890bf250ed73a69b433553 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Pillager.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
|
||||
@@ -87,6 +87,11 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
|
||||
@@ -821,7 +821,7 @@ index ec2f96b3517bd99cbd616aee56d0b1c6f6247759..1d4fed01ee94678e04962df0f086f53e
|
||||
|
||||
@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 39f6b2a5fc0a37a96098a75f1972e7316572216f..14f9c31954583089f62f5f29b83fc6c8412bc5ee 100644
|
||||
index ee24dd327182387f6547532963972846acfb4da3..377888447aefefe360813e11129b2d1d0633b298 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
|
||||
@@ -96,6 +96,11 @@ public class Ravager extends Raider {
|
||||
@@ -837,7 +837,7 @@ index 39f6b2a5fc0a37a96098a75f1972e7316572216f..14f9c31954583089f62f5f29b83fc6c8
|
||||
|
||||
@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 893141e599c6e1917831110470b6b1c0bb0ba1d5..0db649cc7e7d784b75e201e00d241608e13e635b 100644
|
||||
index be7e8364c66466eb1206b7f91c61f82cebcec0bf..6c8be0270477f2bb262c83ebcd4b98899cae0ad4 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
|
||||
@@ -137,6 +137,11 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
|
||||
@@ -853,7 +853,7 @@ index 893141e599c6e1917831110470b6b1c0bb0ba1d5..0db649cc7e7d784b75e201e00d241608
|
||||
|
||||
@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 ca4f5eaebbb1ca0ff940665098e756afb4d2f0db..dd2c7859a2afa3311229b6fac1777f1949175fc8 100644
|
||||
index f30d3b012d933efe880e75367a8d21aa03c40148..e97ab55e19806bce1f5834f2b55863cd76ffa966 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
|
||||
@@ -67,6 +67,11 @@ public class Silverfish extends Monster {
|
||||
@@ -869,7 +869,7 @@ index ca4f5eaebbb1ca0ff940665098e756afb4d2f0db..dd2c7859a2afa3311229b6fac1777f19
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
|
||||
index 53c5a66a538f00cdfa440e41b6dd2a912dbb1a37..f5e8fbccd819f6fb66918bceb93d000da038d7ef 100644
|
||||
index 79c7f5c15748f0989c9167a06e6e7d0500f70460..875f1ae6a16301b48ddcf7005c601a161dee124d 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
|
||||
@@ -51,6 +51,11 @@ public class Skeleton extends AbstractSkeleton {
|
||||
@@ -885,7 +885,7 @@ index 53c5a66a538f00cdfa440e41b6dd2a912dbb1a37..f5e8fbccd819f6fb66918bceb93d000d
|
||||
|
||||
@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 752de9fdf475e6c5c395feb6ae82474fed14d880..016ff734097c1f923aec24fe9a486630bbd5bf23 100644
|
||||
index c44dfe6ea5d872b927597afc5e02477f181da012..0ab135557da220f5f2744749f0d90ce6fd4a0560 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
|
||||
@@ -140,6 +140,11 @@ public class Slime extends Mob implements Enemy {
|
||||
@@ -901,7 +901,7 @@ index 752de9fdf475e6c5c395feb6ae82474fed14d880..016ff734097c1f923aec24fe9a486630
|
||||
|
||||
@Override
|
||||
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 a3066ac1c69df22e04b86c6d81e4df270a3ecff9..25b90be6593b703cba6d3e272a4153557b631ead 100644
|
||||
index 2b0de124a0b113bcbc90c0c82b67cdaeb46b9f55..b335c4d224dcf1dbb698a6eef133a68c4104cf93 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
|
||||
@@ -76,6 +76,11 @@ public class Spider extends Monster {
|
||||
@@ -917,7 +917,7 @@ index a3066ac1c69df22e04b86c6d81e4df270a3ecff9..25b90be6593b703cba6d3e272a415355
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/Stray.java b/src/main/java/net/minecraft/world/entity/monster/Stray.java
|
||||
index 703d997e22ea24a93d054d72ca914f8a5a8cdc0a..c1d36eb62c52c3fd8055e3b6c7d504c83fe3042e 100644
|
||||
index e259ca878a2312fe941f44667d05939dc871f20e..65be1dfe09861f093b74ae07d694447efc8b639a 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Stray.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Stray.java
|
||||
@@ -46,6 +46,11 @@ public class Stray extends AbstractSkeleton {
|
||||
@@ -933,7 +933,7 @@ index 703d997e22ea24a93d054d72ca914f8a5a8cdc0a..c1d36eb62c52c3fd8055e3b6c7d504c8
|
||||
|
||||
public static boolean checkStraySpawnRules(EntityType<Stray> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource 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 d20376eab4dc9d95acb5cd9dc8fa0f80965a65fd..321392d87a4f4f1a764f67a7216821aeecc10bed 100644
|
||||
index 97a94ee517021e07df3a4d69f8ae854cd993f784..99f52bc11a155626f76843f0c3dd1d36416b00ba 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
|
||||
@@ -125,6 +125,11 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
|
||||
@@ -949,7 +949,7 @@ index d20376eab4dc9d95acb5cd9dc8fa0f80965a65fd..321392d87a4f4f1a764f67a7216821ae
|
||||
|
||||
public static boolean checkStriderSpawnRules(EntityType<Strider> type, LevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource 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 16e9f78c6a84f7be9d2f7185045680853a26da05..b0bf6d477ec80e5e11825f463cce788550b336d4 100644
|
||||
index 73773dc5eb0d21746ea31459b659767e88eedd72..58ea42cce4b3dfc207ae42e0448d958fd478a14a 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java
|
||||
@@ -115,6 +115,11 @@ public class Vex extends Monster implements TraceableEntity {
|
||||
@@ -965,7 +965,7 @@ index 16e9f78c6a84f7be9d2f7185045680853a26da05..b0bf6d477ec80e5e11825f463cce7885
|
||||
|
||||
@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 b9b2e76535da32965615de563d4674cee4abd7f0..efbfe0a151686f00051026113c4d1f4d9c9eb241 100644
|
||||
index 2d2d01187d3fc6a17b3e98b5e5ab018d3af88af1..3b5c97b372c99f30e7a6606ed953d61bd600a444 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
|
||||
@@ -83,6 +83,11 @@ public class Vindicator extends AbstractIllager {
|
||||
@@ -981,7 +981,7 @@ index b9b2e76535da32965615de563d4674cee4abd7f0..efbfe0a151686f00051026113c4d1f4d
|
||||
|
||||
@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 851ae9a93da64875a6102d185c6ba36e6c868044..3d26297229318a95a808253384ca01c94bf71f62 100644
|
||||
index 2269d316c826f0dbe18ad9968c8fc04335db13fc..01f164f417d861f30507f2048e0df12475a39380 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
|
||||
@@ -82,6 +82,11 @@ public class Witch extends Raider implements RangedAttackMob {
|
||||
@@ -997,7 +997,7 @@ index 851ae9a93da64875a6102d185c6ba36e6c868044..3d26297229318a95a808253384ca01c9
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
|
||||
index dd47abc25f71ad019025e11bdf9f5ca97c2c78f3..56f1c52afe32ce71edd44c7bc3ff1ac1f09457a2 100644
|
||||
index 09dab86cb43ebc66423c0a8b65ea6a8c28604b87..189897d50e2596c7ffd6b0434557c08f31b6959d 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
|
||||
@@ -60,6 +60,11 @@ public class WitherSkeleton extends AbstractSkeleton {
|
||||
@@ -1013,7 +1013,7 @@ index dd47abc25f71ad019025e11bdf9f5ca97c2c78f3..56f1c52afe32ce71edd44c7bc3ff1ac1
|
||||
|
||||
@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 e120d5c054585f539bdc086eb33d5eb0b4b07e57..8b522186395d570bb14db94df8df2c4fa3705a7e 100644
|
||||
index 3715ff68d6c134d6f1cdf4a3e04db8a069bbf3b8..af31d334485139ef06bc534484a69f720ed1b5cf 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
|
||||
@@ -92,6 +92,11 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
|
||||
@@ -1029,7 +1029,7 @@ index e120d5c054585f539bdc086eb33d5eb0b4b07e57..8b522186395d570bb14db94df8df2c4f
|
||||
|
||||
@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 dfa2806faedf70ca5ffe77087a67822a21e6aac2..ef8cca70661cedecf08a787011342c402eb59a79 100644
|
||||
index 074cbcf451f0f524510b4ab0273fceedfba143e3..f0214bdfca5ccc7bed147bf1642efcdcbce4fcaf 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
|
||||
@@ -144,6 +144,11 @@ public class Zombie extends Monster {
|
||||
@@ -1045,7 +1045,7 @@ index dfa2806faedf70ca5ffe77087a67822a21e6aac2..ef8cca70661cedecf08a787011342c40
|
||||
|
||||
@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 c51e04e90e6a5b5b549666fe739491c148d6268d..0fdfcb3a26698f26caf163828f2cf89e2a28054a 100644
|
||||
index ce644b92598f70872e365584844eaefaccfd52dc..433399fe43acdd8a7a199b95f8de2c02b3f69df3 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
|
||||
@@ -124,6 +124,11 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
|
||||
@@ -1061,7 +1061,7 @@ index c51e04e90e6a5b5b549666fe739491c148d6268d..0fdfcb3a26698f26caf163828f2cf89e
|
||||
|
||||
@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 45ed7baaf5cbb3c368bc0051462bfba35c5d6726..ab33a30995d741898cd034fe0fad99eff3529707 100644
|
||||
index 426dbf4f78ce6d731313a45380fd23cdeb91efb1..dbbbac09ac83a4a060923a8fdc8a6dd0a19679bf 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
|
||||
@@ -103,6 +103,11 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
|
||||
@@ -1077,7 +1077,7 @@ index 45ed7baaf5cbb3c368bc0051462bfba35c5d6726..ab33a30995d741898cd034fe0fad99ef
|
||||
|
||||
@Override
|
||||
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 7db4cacb490f8fb942ead1bd6e22c19a938b2656..4a6adf17ecc95c19b5f9e36e7cd1161e8a9a22c2 100644
|
||||
index 48d25e6015b9419a4f6d0f81877af2dcc9d91023..92685decf4ed1c9f673cf607458788c2f807d626 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
|
||||
@@ -97,6 +97,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
|
||||
@@ -1093,7 +1093,7 @@ index 7db4cacb490f8fb942ead1bd6e22c19a938b2656..4a6adf17ecc95c19b5f9e36e7cd1161e
|
||||
|
||||
@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 e605d47332461d39960c5b9b29ef88873068508c..8e670ac3e4f60174b593c477dcc476f468668ee4 100644
|
||||
index b6d10dd654d2890464802faf0752816b4ac35e1c..ff2c7610d39e50ffb548aa9a687d7973a1f17a35 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
|
||||
@@ -122,6 +122,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
|
||||
@@ -1109,7 +1109,7 @@ index e605d47332461d39960c5b9b29ef88873068508c..8e670ac3e4f60174b593c477dcc476f4
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
|
||||
index a44f9a59fbec146df95d89c26df12efb79f6179a..760015f7a98e70b735707c77472c084d8bd052bb 100644
|
||||
index fd8f5ef1842eaa8676893fcd53f550ab5ccb3b93..b6165a1d513bea0d441289eb0df05ea866941bb3 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
|
||||
@@ -66,6 +66,11 @@ public class PiglinBrute extends AbstractPiglin {
|
||||
@@ -1125,7 +1125,7 @@ index a44f9a59fbec146df95d89c26df12efb79f6179a..760015f7a98e70b735707c77472c084d
|
||||
|
||||
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 b522104b5dc814216d2054b1197d5b0e59206a1e..1e3bc16aee307948e6d42a39aa17db96d14bd43b 100644
|
||||
index 7a7e200f79a1055217139992d26561bd54164677..6b97c1b84ee64f0f7cf7fb329a5123a3acc512d0 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
||||
@@ -189,6 +189,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
|
||||
@@ -1141,7 +1141,7 @@ index b522104b5dc814216d2054b1197d5b0e59206a1e..1e3bc16aee307948e6d42a39aa17db96
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
|
||||
index b5f475a64d087d10dced539bc16050e72fce020e..62e6028cce6b7867b4f68ac6760fd78791101a55 100644
|
||||
index e06f3ee85dde587f1146d4a3d70e8a2e5b9a128b..2e9dd920e5c3943cba4c53ec2a2b48eeaf3889a7 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
|
||||
@@ -99,6 +99,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
|
||||
|
||||
@@ -1002,7 +1002,7 @@ index 2e6e8eac987c4ef6b2dcd3de592d8a51d2b29792..863343a87fe34d72f04af89d75268b47
|
||||
};
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
index 6bb9b0b84367e6b670aeb2de51f94714821db53d..f68b42f80bb8d76d08589f2d3047da1e07984092 100644
|
||||
index b7f1dad5ffe5a0f5d337fbe39345242940b82e4b..ffe329e624b4d7db6c2b6f49f31093ab02116214 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -789,7 +789,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
||||
@@ -1128,7 +1128,7 @@ index 6bb9b0b84367e6b670aeb2de51f94714821db53d..f68b42f80bb8d76d08589f2d3047da1e
|
||||
}
|
||||
} else {
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
index f1c4ee3416592b91a255a482c272d3df8114e8c8..a0500cab65501a7a0ac2e8aa0efacc3105731c6b 100644
|
||||
index 9ff8a54f48d0f3c8a4b434f5dae7bf31c7a334e5..64ddf35722640fa764b6b508196f0303676193cb 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
@@ -394,7 +394,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
||||
@@ -1428,7 +1428,7 @@ index 288c6627906d07c0d223eacd84ae4eb31a349998..9babe636176da3c40598eb5bdac0919a
|
||||
this.seen.add(i);
|
||||
} else {
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
|
||||
index 0d4fb258c53468ddd15413f7a802c9f89677972e..4c4b27a762d4faf0467136ee92a3bbba5ab7322d 100644
|
||||
index 4e9f4bddaf9221c02e5dc127aa796a24c83ed8f7..afbce4fdece213e456ef4e993f07bfb448bb2dd1 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
|
||||
@@ -260,12 +260,12 @@ public class Allay extends PathfinderMob implements InventoryCarrier {
|
||||
@@ -1449,10 +1449,10 @@ index 0d4fb258c53468ddd15413f7a802c9f89677972e..4c4b27a762d4faf0467136ee92a3bbba
|
||||
}
|
||||
|
||||
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 f931b6fde9e40473bacbe04bc72e00288f00e4eb..16a4c5abb702378e73000d3c2d4090a390453975 100644
|
||||
index d61d9a7e7fa4d360dc740fdcb31efd028452fe61..e46105d1d15b4f8d24f726cc75be3020a5770c5c 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
|
||||
@@ -329,12 +329,12 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
|
||||
@@ -324,12 +324,12 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
|
||||
|
||||
@Override
|
||||
protected void customServerAiStep() {
|
||||
@@ -1492,7 +1492,7 @@ index 14386280e7ab006787054ca17503ec8ef0ab9621..ed07b29820ba7032bab439a7f5db0e2d
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
|
||||
index c544db9508c39a062480e42a98ab0b5ba6fb9e59..0b64fa0639dfbb7dc06d9a32f755938095968300 100644
|
||||
index 61c604a05eedb1928bdac8c8544b0cad074f29ee..695b4fa27fc989ead95e4c46d9305a62f17487fa 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
|
||||
@@ -222,12 +222,12 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
|
||||
@@ -1513,7 +1513,7 @@ index c544db9508c39a062480e42a98ab0b5ba6fb9e59..0b64fa0639dfbb7dc06d9a32f7559380
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
|
||||
index 9e499aecc623ba10301899ab9a64b76464a5e203..2854b9311686e3b62820e545c9b2819d75c18b0b 100644
|
||||
index f12bd0227af77bec164f2938957c0c8100be9d03..16cc27ad7c152c5ea0854ba095a72ea3de64eb7e 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
|
||||
@@ -116,12 +116,12 @@ public class Tadpole extends AbstractFish {
|
||||
@@ -1534,7 +1534,7 @@ index 9e499aecc623ba10301899ab9a64b76464a5e203..2854b9311686e3b62820e545c9b2819d
|
||||
}
|
||||
|
||||
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 9e1e1a7d0fc58d70e3566acc78e27b825ddd8ab8..cc319c0d2d34d72709c7bd60282c474d2698dc25 100644
|
||||
index 9d813827c27823c2e01341330cda1a64c4cdd315..ac91fe2c9b0c293789c4e0273823ddf5601b666d 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
|
||||
@@ -230,10 +230,10 @@ public class Goat extends Animal {
|
||||
@@ -1552,7 +1552,7 @@ index 9e1e1a7d0fc58d70e3566acc78e27b825ddd8ab8..cc319c0d2d34d72709c7bd60282c474d
|
||||
}
|
||||
|
||||
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 8b522186395d570bb14db94df8df2c4fa3705a7e..70d891d85748039b517a87b2438b04a9010d8af4 100644
|
||||
index af31d334485139ef06bc534484a69f720ed1b5cf..d5cc573bd73a241594bd6c0505821ec10acf9b3d 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
|
||||
@@ -230,10 +230,10 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
|
||||
@@ -1569,7 +1569,7 @@ index 8b522186395d570bb14db94df8df2c4fa3705a7e..70d891d85748039b517a87b2438b04a9
|
||||
}
|
||||
|
||||
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 4a6adf17ecc95c19b5f9e36e7cd1161e8a9a22c2..a2c46c6b7adf43212ca081f08cc0abbfe75748d4 100644
|
||||
index 92685decf4ed1c9f673cf607458788c2f807d626..d3524004f447fff9b091f03b8fe18f6656b98313 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
|
||||
@@ -165,10 +165,10 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
|
||||
@@ -1586,7 +1586,7 @@ index 4a6adf17ecc95c19b5f9e36e7cd1161e8a9a22c2..a2c46c6b7adf43212ca081f08cc0abbf
|
||||
if (this.isConverting()) {
|
||||
++this.timeInOverworld;
|
||||
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 8e670ac3e4f60174b593c477dcc476f468668ee4..89669eafa7fdb6e9377d64de0203dbf78acf1b78 100644
|
||||
index ff2c7610d39e50ffb548aa9a687d7973a1f17a35..e7528b55713c0719c1510856fd029bcf5c2b75c2 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
|
||||
@@ -342,10 +342,10 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
|
||||
@@ -1603,7 +1603,7 @@ index 8e670ac3e4f60174b593c477dcc476f468668ee4..89669eafa7fdb6e9377d64de0203dbf7
|
||||
super.customServerAiStep();
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
|
||||
index 760015f7a98e70b735707c77472c084d8bd052bb..bc6572b1025d74a7590d7e1cc49132f95af0560a 100644
|
||||
index b6165a1d513bea0d441289eb0df05ea866941bb3..061868ea8d7bb9825a2f097949e1430cf59dbf81 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
|
||||
@@ -117,10 +117,10 @@ public class PiglinBrute extends AbstractPiglin {
|
||||
@@ -1620,7 +1620,7 @@ index 760015f7a98e70b735707c77472c084d8bd052bb..bc6572b1025d74a7590d7e1cc49132f9
|
||||
PiglinBruteAi.maybePlayActivitySound(this);
|
||||
super.customServerAiStep();
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
|
||||
index 4aa043ef7756b456b02049d22998444b2213dcdd..e803e04f00ef8418e7599f36efeda3cd12e7f62b 100644
|
||||
index a268f6a39b972f91ca04d6b0004efda4cf086e10..d72221ab3e6d92a1bb5b8303ce3152f8f15449d8 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
|
||||
@@ -298,9 +298,9 @@ public class Warden extends Monster implements VibrationListener.VibrationListen
|
||||
@@ -1636,7 +1636,7 @@ index 4aa043ef7756b456b02049d22998444b2213dcdd..e803e04f00ef8418e7599f36efeda3cd
|
||||
if ((this.tickCount + this.getId()) % 120 == 0) {
|
||||
Warden.applyDarknessAround(worldserver, this.position(), this, 20);
|
||||
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 59aca9a0ec9696f4461b6331abfe1314f239e64f..b2e3a749a3f0aa663f2381f2d36ca57426d5c5eb 100644
|
||||
index 87e1782baf0f5d083c23dd848952e8eac51e40f0..9c5d1426c19309048bd33e7a44818b7edbe6a431 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
||||
@@ -332,7 +332,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
|
||||
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement squid colors for rainglow fabric mod
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
|
||||
index b7abcaa32341c292f9f884fa6319fd65596e1b37..5d6cddc221887be20ef75d688817dfe527e73362 100644
|
||||
index c2309434b4d48a44587590623ac98dbf997b9578..6f723171fa71d74b351b5cf0cd167bb6f7ca1691 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
|
||||
@@ -18,6 +18,7 @@ import net.minecraft.world.level.block.Blocks;
|
||||
@@ -16,7 +16,7 @@ index b7abcaa32341c292f9f884fa6319fd65596e1b37..5d6cddc221887be20ef75d688817dfe5
|
||||
|
||||
public GlowSquid(EntityType<? extends GlowSquid> type, Level world) {
|
||||
super(type, world);
|
||||
@@ -69,6 +70,7 @@ public class GlowSquid extends Squid {
|
||||
@@ -65,6 +66,7 @@ public class GlowSquid extends Squid {
|
||||
protected void defineSynchedData() {
|
||||
super.defineSynchedData();
|
||||
this.entityData.define(DATA_DARK_TICKS_REMAINING, 0);
|
||||
@@ -24,7 +24,7 @@ index b7abcaa32341c292f9f884fa6319fd65596e1b37..5d6cddc221887be20ef75d688817dfe5
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -95,12 +97,14 @@ public class GlowSquid extends Squid {
|
||||
@@ -91,12 +93,14 @@ public class GlowSquid extends Squid {
|
||||
public void addAdditionalSaveData(CompoundTag nbt) {
|
||||
super.addAdditionalSaveData(nbt);
|
||||
nbt.putInt("DarkTicksRemaining", this.getDarkTicksRemaining());
|
||||
|
||||
@@ -4,8 +4,21 @@ Date: Sun, 13 Nov 2022 05:05:34 -0600
|
||||
Subject: [PATCH] Add option to teleport to spawn on nether ceiling damage
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
index 15a6e8d23d8f626d7d5587f97c6ec5b10ab9afa8..74238a87d1ff3391aac5812b24b84af228baeaa4 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
@@ -2681,7 +2681,7 @@ public class ServerPlayer extends Player {
|
||||
|
||||
ServerLevel toLevel = ((CraftWorld) to.getWorld()).getHandle();
|
||||
if (this.level == toLevel) {
|
||||
- this.connection.internalTeleport(to.getX(), to.getY(), to.getZ(), to.getYaw(), to.getPitch(), java.util.EnumSet.noneOf(net.minecraft.network.protocol.game.ClientboundPlayerPositionPacket.RelativeArgument.class), true);
|
||||
+ this.connection.internalTeleport(to.getX(), to.getY(), to.getZ(), to.getYaw(), to.getPitch(), java.util.EnumSet.noneOf(net.minecraft.world.entity.RelativeMovement.class));
|
||||
} else {
|
||||
this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck);
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
index 9f73c9c9109686ff9d2a87465b887747a9b18d6b..fe3a4a80197e911b44fefae0972a09482ba9cd81 100644
|
||||
index 099b7da30aaf2dca7fe556d26c1395f662fbf80a..3f59268a8e01cebd9e08984ae754e928b085a0ac 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -864,6 +864,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
||||
|
||||
Reference in New Issue
Block a user