mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 17:37:42 +01:00
fix some compile errors
This commit is contained in:
granny
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user