mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 01:17:42 +01:00
Update to 1.18.2
This commit is contained in:
BillyGalbreath
@@ -5,7 +5,7 @@ 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 32211dfd76c03d1eb59929b93eb69cc6adde81ac..7b0afbfaaddf19997d5282473e8c1c60339dd201 100644
|
||||
index e98176b7969589897ee784bfb83f6c3f40cecd68..5e5eaf7c20c3329f2e576c8672a6be918ab16d88 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 {
|
||||
@@ -21,10 +21,10 @@ index 32211dfd76c03d1eb59929b93eb69cc6adde81ac..7b0afbfaaddf19997d5282473e8c1c60
|
||||
|
||||
@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 062b99e9586199454c3948d37aa66f866b8b644d..9f8153496f173de6b8ee26ae765255a1ba2b3073 100644
|
||||
index 4d39f68a0d0de84474ef96f10cb35e97db2fd9f8..30ecad8a2530c2f4eb0ff0ae43f22d3805baa6a6 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
|
||||
@@ -108,6 +108,11 @@ public class Bat extends AmbientCreature {
|
||||
@@ -107,6 +107,11 @@ public class Bat extends AmbientCreature {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.batTakeDamageFromWater;
|
||||
}
|
||||
@@ -37,10 +37,10 @@ index 062b99e9586199454c3948d37aa66f866b8b644d..9f8153496f173de6b8ee26ae765255a1
|
||||
|
||||
@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 c69d0cc9ed74e4e06465aebff07b6b50c227fb28..e2a3a3e2722c7c5fae232ce30538ccb5fa663b7d 100644
|
||||
index ca7225e80e1612120ac9b197e0188a06df8049a7..02fc6bb52419b75f04092b33e15e0ab1ea7a7b1a 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
|
||||
@@ -230,6 +230,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
|
||||
@@ -228,6 +228,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.beeTakeDamageFromWater;
|
||||
}
|
||||
@@ -53,10 +53,10 @@ index c69d0cc9ed74e4e06465aebff07b6b50c227fb28..e2a3a3e2722c7c5fae232ce30538ccb5
|
||||
|
||||
@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 5759ff40254ff7238e7b874822f743fbf0d33e81..94d5c14b777d8fd822b501b297acedf58cc56937 100644
|
||||
index 8d49f4c9d5d9a0f4dc4a1c1dcdcc7bfc678d8de3..108c8b0d25ae9432a54b9bca4cae7297f303ca81 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
|
||||
@@ -160,6 +160,11 @@ public class Cat extends TamableAnimal {
|
||||
@@ -162,6 +162,11 @@ public class Cat extends TamableAnimal {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.catTakeDamageFromWater;
|
||||
}
|
||||
@@ -69,7 +69,7 @@ index 5759ff40254ff7238e7b874822f743fbf0d33e81..94d5c14b777d8fd822b501b297acedf5
|
||||
|
||||
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 e00f65973622b476e27ae7de5fa8dc8c42ef4af7..01b2c874f209969a15acbe617260395f3df1dd0b 100644
|
||||
index d7ddb71ae59ab0a0e10717e5c678ef5e5476aba4..d4b2e6715479c485258fdec9497a0da40e5df3ef 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
|
||||
@@ -85,6 +85,11 @@ public class Chicken extends Animal {
|
||||
@@ -117,10 +117,10 @@ index 90e48fed68fab8e5e9f43bbeffd3a42a2ee51807..1c112e79a97648219022dc4586bfa520
|
||||
|
||||
@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 7e424c7674e6e8f1db42bbdfbb230174f885a07d..c809ea41cf585f4adba1772043626a462f280c9a 100644
|
||||
index ce86a56da5aaf65a34352eab1da20e4340175248..55ea2944582ae12bfdf188a8cdc2285e4b60499e 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
|
||||
@@ -170,6 +170,11 @@ public class Dolphin extends WaterAnimal {
|
||||
@@ -168,6 +168,11 @@ public class Dolphin extends WaterAnimal {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.dolphinTakeDamageFromWater;
|
||||
}
|
||||
@@ -133,10 +133,10 @@ index 7e424c7674e6e8f1db42bbdfbb230174f885a07d..c809ea41cf585f4adba1772043626a46
|
||||
|
||||
@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 8cdae4fb31b517015e6b154a68b2c37fe76fa127..0d3528f24b4184f7553bd1b91279f3a014a47601 100644
|
||||
index d0e9f326e755f1e9e8a9f96f9effba5f80faab1e..1b4d3722e3c2218e8712f4275392f517369d5417 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
||||
@@ -192,6 +192,11 @@ public class Fox extends Animal {
|
||||
@@ -193,6 +193,11 @@ public class Fox extends Animal {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.foxTakeDamageFromWater;
|
||||
}
|
||||
@@ -149,7 +149,7 @@ index 8cdae4fb31b517015e6b154a68b2c37fe76fa127..0d3528f24b4184f7553bd1b91279f3a0
|
||||
|
||||
@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 c7ac716958900ccbd03fda080147de5332596a64..add29f2da31ff2fe6f531e78a0b49a9aa1ae8452 100644
|
||||
index 1f90c7e164848f08ff6c4aacf0a6154750cfe21d..5a74ef4baf5e22921fe54cc65e492b3b1c4d40d6 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
|
||||
@@ -105,6 +105,11 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
|
||||
@@ -165,10 +165,10 @@ index c7ac716958900ccbd03fda080147de5332596a64..add29f2da31ff2fe6f531e78a0b49a9a
|
||||
|
||||
@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 4cfba039e940d8354a04a5ba761a5c0e10e695a3..00cfd89f175206b3bb29d3a954f8564077a7115b 100644
|
||||
index 047404f4e38b9d796ceecb4e07740942eb137ae0..48459f6c9a9d7112ef335725e1989883a892c9d7 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
|
||||
@@ -95,6 +95,11 @@ public class MushroomCow extends Cow implements Shearable {
|
||||
@@ -94,6 +94,11 @@ public class MushroomCow extends Cow implements Shearable {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.mooshroomTakeDamageFromWater;
|
||||
}
|
||||
@@ -181,10 +181,10 @@ index 4cfba039e940d8354a04a5ba761a5c0e10e695a3..00cfd89f175206b3bb29d3a954f85640
|
||||
|
||||
@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 23a7b7c259f00ca44616af2e97a360a63cb55120..7e32d81e451442b3e90817ef402446dcd2c706dd 100644
|
||||
index 5442baf10ca180b104bf1fd9cbcc12bb7a6146fc..3bfa7ed23d659899cccad5eb4caad6997ae2b419 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
|
||||
@@ -99,6 +99,11 @@ public class Ocelot extends Animal {
|
||||
@@ -98,6 +98,11 @@ public class Ocelot extends Animal {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.ocelotTakeDamageFromWater;
|
||||
}
|
||||
@@ -197,7 +197,7 @@ index 23a7b7c259f00ca44616af2e97a360a63cb55120..7e32d81e451442b3e90817ef402446dc
|
||||
|
||||
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 44302e7f86c45fb10dd9770e214e66512328d821..821f6bd8a672f375ae14b9117e7b4ba96e2591dd 100644
|
||||
index 538d52c49ec35653ace723e25adf40217c7ed775..519adb77d5dc63ce8d1048c97caa7ebe2c6572ce 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
||||
@@ -147,6 +147,11 @@ public class Panda extends Animal {
|
||||
@@ -213,10 +213,10 @@ index 44302e7f86c45fb10dd9770e214e66512328d821..821f6bd8a672f375ae14b9117e7b4ba9
|
||||
|
||||
@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 d68bb48cf703a3ed0bf843d5c0ab9caad4727214..8f2a2a4af0725d1436514108c7200c92effa12a9 100644
|
||||
index 661d8ce472a5f57107035ec32158aea30e1d181b..b10fc35fca9b1ef5f3cd4b622293d0410bf4e595 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
|
||||
@@ -201,6 +201,11 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
|
||||
@@ -199,6 +199,11 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.parrotTakeDamageFromWater;
|
||||
}
|
||||
@@ -229,7 +229,7 @@ index d68bb48cf703a3ed0bf843d5c0ab9caad4727214..8f2a2a4af0725d1436514108c7200c92
|
||||
|
||||
@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 479570e9f98404ac01ef08ce81ef200340cea602..333989ee2a52bd4f1a55ecebce4f657905d3d767 100644
|
||||
index a24dffe25615c9c9a4b641b291ce735e3f1dd6b7..91a0737ac4edf457d4bda604d30341954df283ca 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,10 +245,10 @@ index 479570e9f98404ac01ef08ce81ef200340cea602..333989ee2a52bd4f1a55ecebce4f6579
|
||||
|
||||
@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 753642045e2594d67887a766a8b6c477767a6edb..2632adf6c6a7eac0387d0838b7e5f04a8971f7aa 100644
|
||||
index 3fe05be69cada8df7553ee0fb9828e5ec593f54f..368306ea53daea82abe95e9d6c61ca25c7f7cca5 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
|
||||
@@ -130,6 +130,11 @@ public class PolarBear extends Animal implements NeutralMob {
|
||||
@@ -128,6 +128,11 @@ public class PolarBear extends Animal implements NeutralMob {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.polarBearTakeDamageFromWater;
|
||||
}
|
||||
@@ -261,7 +261,7 @@ index 753642045e2594d67887a766a8b6c477767a6edb..2632adf6c6a7eac0387d0838b7e5f04a
|
||||
|
||||
@Override
|
||||
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 413f2491aad79409f4ac0759f7b649f1367376a5..59186e53cabefba3da4ed7356f8bf6e390da8e36 100644
|
||||
index 2a9af6af653dc62c99baff01ebea8ad64ff62fe0..bf9e6b6ca2b2bf8b2a2e96d10cd4fda9c59df1b8 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 {
|
||||
@@ -277,10 +277,10 @@ index 413f2491aad79409f4ac0759f7b649f1367376a5..59186e53cabefba3da4ed7356f8bf6e3
|
||||
|
||||
@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 b3c258b2e46433645b706b5a43012094f584abe0..a1e19e1acdecbab1b1c955617b800cdf493fd507 100644
|
||||
index dba2e1d677d7ac26517736cfbe2ee9d742fa4482..38e75142bbd2c28254a4634b852ca8eb5890758e 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 {
|
||||
@@ -151,6 +151,11 @@ public class Rabbit extends Animal {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.rabbitTakeDamageFromWater;
|
||||
}
|
||||
@@ -325,7 +325,7 @@ index 4fa8e4a298a98b2a41ef7572d21ed50aa06e2c7e..17d1a0b43b2d155535cf2483af4ba9dd
|
||||
|
||||
@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 4a33a9a439ca7f9bdb40ea15a721a30f6028f14a..2396c175433fdfe23b0db0e3303d82c34309a540 100644
|
||||
index b84376598527b7081808ee0c60fcd911c32ce7e7..83906fbb59d678451f93e6335aa674a7ff6bc9b1 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 4a33a9a439ca7f9bdb40ea15a721a30f6028f14a..2396c175433fdfe23b0db0e3303d82c3
|
||||
|
||||
@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 49c043efc3f88ea9c5339e5011de80d2d42906c5..5c68c5992a2f52eef71fff4018f70fe4d74fa8fb 100644
|
||||
index 7a8f8be052dc3ee6dc56dd39017e11488af0a8ff..21f5304e01e0844f1bbf3e1b2f9d50c01f8bf8fd 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
|
||||
@@ -101,6 +101,11 @@ public class Squid extends WaterAnimal {
|
||||
@@ -100,6 +100,11 @@ public class Squid extends WaterAnimal {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.squidTakeDamageFromWater;
|
||||
}
|
||||
@@ -357,10 +357,10 @@ index 49c043efc3f88ea9c5339e5011de80d2d42906c5..5c68c5992a2f52eef71fff4018f70fe4
|
||||
|
||||
@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 5b8a6b2705c6f317e4e48e7a9183b140489c355a..9585b8a3d6d0777df3fb4debfd9d7a776b035bad 100644
|
||||
index 206729081b8316ac76a808ec509a7aee4d6831f7..60ee899a7606fd9a7de3e4fad963a11816690b92 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
|
||||
@@ -75,6 +75,11 @@ public class TropicalFish extends AbstractSchoolingFish {
|
||||
@@ -74,6 +74,11 @@ public class TropicalFish extends AbstractSchoolingFish {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.tropicalFishTakeDamageFromWater;
|
||||
}
|
||||
@@ -373,10 +373,10 @@ index 5b8a6b2705c6f317e4e48e7a9183b140489c355a..9585b8a3d6d0777df3fb4debfd9d7a77
|
||||
|
||||
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 e8e317c822a73b98545f3cf6e36aa284937e8c5b..1b14e6fed7669651741344a18c81da6207c9e924 100644
|
||||
index 3c38345b32d106a169d1e6abcae54f282d08fe89..ddc69668c30e089df18858f697b6370d1931eed8 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
|
||||
@@ -116,6 +116,11 @@ public class Turtle extends Animal {
|
||||
@@ -114,6 +114,11 @@ public class Turtle extends Animal {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.turtleTakeDamageFromWater;
|
||||
}
|
||||
@@ -389,10 +389,10 @@ index e8e317c822a73b98545f3cf6e36aa284937e8c5b..1b14e6fed7669651741344a18c81da62
|
||||
|
||||
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 63d3f68326386532b027c077c35629c75508bfc4..f3ff018e61eb89d581744d5dfae00f4d5bcd4949 100644
|
||||
index 3ee87e888b048dd3272a633b40b5987276b30155..9e47e6e546af5e5d5c8fefa885742cfbd9a64cba 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
||||
@@ -209,6 +209,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
|
||||
@@ -212,6 +212,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.wolfTakeDamageFromWater;
|
||||
}
|
||||
@@ -405,10 +405,10 @@ index 63d3f68326386532b027c077c35629c75508bfc4..f3ff018e61eb89d581744d5dfae00f4d
|
||||
|
||||
@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 dc84d044aa7533d31c48ed80e49c44951320cb5e..b3f2bd60cd52a51e04cf92da321d247f1d2c7c7b 100644
|
||||
index b7e2ed08864f5bde346faebf9498254dc9794ce6..d87a3434cbac31ef652e4dda08c280a5da51142e 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
|
||||
@@ -132,6 +132,11 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
|
||||
@@ -134,6 +134,11 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.axolotlTakeDamageFromWater;
|
||||
}
|
||||
@@ -421,10 +421,10 @@ index dc84d044aa7533d31c48ed80e49c44951320cb5e..b3f2bd60cd52a51e04cf92da321d247f
|
||||
|
||||
@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 dbfb6aa819d7bb86c60268daf9cf0b5a5200c5b1..3c4a53e569257a6f73fec9af2be25a422cc9e8b6 100644
|
||||
index 02146c9b5d64ed84869f946638f639d3cd176e5e..521fca2ae3297604e4a5a2579889ab564cfe97e5 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 {
|
||||
@@ -99,6 +99,11 @@ public class Goat extends Animal {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.goatTakeDamageFromWater;
|
||||
}
|
||||
@@ -469,10 +469,10 @@ index 16755249c4700fa59f704b7c88e3490d2ce3fc48..17a6ddaaa474ee4ac9dd77c19a471bfb
|
||||
|
||||
@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 6fffb293e1ca06a9f07fe30928e4dd8fff1b0a15..b0b8239ef3d9124343c8351320801d8f427773fd 100644
|
||||
index 68f28835905c018428d848c1fc9ffe7dabcac0d3..ce6efd1d26ad9fcaf0dd1557702c16b164baec08 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
|
||||
@@ -142,6 +142,11 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
|
||||
@@ -141,6 +141,11 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.llamaTakeDamageFromWater;
|
||||
}
|
||||
@@ -549,10 +549,10 @@ index 88da7a365c28e2d097d0a7bff30ea1acd4c7d5dc..74de599bfe2ee696848b3f74392b696f
|
||||
|
||||
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 e30d8bfb4269e872c20a9bf91348dd3685a9332c..ce09b56dc4681eef7fb7f6563125889da016fc07 100644
|
||||
index 3e8f13020f56ce232518a6520d16e90744217938..75f4749c35a4cc35bc8617b1ba5c74ef198a423c 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
|
||||
@@ -238,6 +238,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
|
||||
@@ -237,6 +237,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
|
||||
public void setSummoner(@Nullable java.util.UUID summoner) {
|
||||
this.summoner = summoner;
|
||||
}
|
||||
@@ -565,7 +565,7 @@ index e30d8bfb4269e872c20a9bf91348dd3685a9332c..ce09b56dc4681eef7fb7f6563125889d
|
||||
|
||||
@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 8cebcc68839a510fee3ff085e9308f6d351f51e8..e5652d9348c866027768418f2fd401c40a4e6df0 100644
|
||||
index 081f9ff6edf17a1588649cc69f48b2f577ce809f..d91b24400c31a2824320ba89369a9851040a867f 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 {
|
||||
@@ -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 b0e5146f0cf33f8fbc97c4c51edee252ad06e6a9..7a8726f69c2e5b4447793770e69118c9174ce3f0 100644
|
||||
index 9a0c450da922b0cdfd304795702df506113402ed..307634db13045413b47e2a18e614a15f325b8d3c 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
|
||||
@@ -165,6 +165,11 @@ public class Creeper extends Monster implements PowerableMob {
|
||||
@@ -613,10 +613,10 @@ index b0e5146f0cf33f8fbc97c4c51edee252ad06e6a9..7a8726f69c2e5b4447793770e69118c9
|
||||
|
||||
@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 699d4f1a60bb15a04dddbce6486ce10abd417a87..a8f13ac43b45a53ccd15fb222cd60ff6f59f0fed 100644
|
||||
index 801e9919dbb197549372afb1b380cdb5f0c9290d..f7221565b51aa35218919a2efea9f83de4b1f786 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
|
||||
@@ -115,6 +115,11 @@ public class Drowned extends Zombie implements RangedAttackMob {
|
||||
@@ -113,6 +113,11 @@ public class Drowned extends Zombie implements RangedAttackMob {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.drownedTakeDamageFromWater;
|
||||
}
|
||||
@@ -645,10 +645,10 @@ index 2800594fea055d75268531d8ad3fef99721e5ca1..fc2b6dc1818d439905e90dc6d738c3cf
|
||||
|
||||
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 1426d3ab3731f849cf88ed1b5e60b694c572ad71..e99751a15f0fef67525b8b392c3893561d240b2b 100644
|
||||
index 425a2cab66ce456b8e034b008d2cb82ecba62004..fee9d1eaadcee7d5bbdacceab5f6e25a30c7e5f2 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
|
||||
@@ -108,6 +108,11 @@ public class EnderMan extends Monster implements NeutralMob {
|
||||
@@ -107,6 +107,11 @@ public class EnderMan extends Monster implements NeutralMob {
|
||||
public void initAttributes() {
|
||||
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.endermanMaxHealth);
|
||||
}
|
||||
@@ -661,10 +661,10 @@ index 1426d3ab3731f849cf88ed1b5e60b694c572ad71..e99751a15f0fef67525b8b392c389356
|
||||
|
||||
@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 3e0f287695fd3def8ed9967d921e141b7ff8bc47..faf16f91cfa689f2bb56fd9ac91aae76056c623b 100644
|
||||
index c644acd4402e41ec1eab919f35e378a8285b9b08..54015c50364e522b68c2546d4f28fff09776e8d6 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
|
||||
@@ -70,6 +70,11 @@ public class Endermite extends Monster {
|
||||
@@ -71,6 +71,11 @@ public class Endermite extends Monster {
|
||||
public void setPlayerSpawned(boolean playerSpawned) {
|
||||
this.isPlayerSpawned = playerSpawned;
|
||||
}
|
||||
@@ -677,7 +677,7 @@ index 3e0f287695fd3def8ed9967d921e141b7ff8bc47..faf16f91cfa689f2bb56fd9ac91aae76
|
||||
|
||||
@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 6c3af9c64f9622150928da09ce8318c21d450b74..396dc17d26475db9037ec0ec2f72dd0750fed43d 100644
|
||||
index 912c594c2a5df21663b26da81cc3d78b37055a6a..7b655fdcee79da60d48e886b3be0dd7c4284a820 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 {
|
||||
@@ -773,7 +773,7 @@ index 5b6a61fb2b44ea4dec4767958a2abe57d758646e..4d50e9d2b9b06cae0fe135cc91a90919
|
||||
|
||||
@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 d5039d0a5e8a35cb7ce43792c909b21d1b0986f2..23e702df207e931e3f41e6094495aea397f32321 100644
|
||||
index b7b4e5173e0f6da888746f1d1679cbde43905bf0..86352b81d2c0be479fe96882c9a01972c9cf341c 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
|
||||
@@ -72,6 +72,11 @@ public class MagmaCube extends Slime {
|
||||
@@ -789,7 +789,7 @@ index d5039d0a5e8a35cb7ce43792c909b21d1b0986f2..23e702df207e931e3f41e6094495aea3
|
||||
|
||||
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 2ae234b2e3f7949fe852d341a5feca9a6738075a..9d83b50d43edc7bfd857daab7be90558d86ca334 100644
|
||||
index 42919b2267eed71e29830a96afdd3be19d6b6f68..bc5d6300c2e5f6cf8fbad73096e8a6e5d279a873 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 {
|
||||
@@ -853,10 +853,10 @@ index e63a27abef4b9aab0c2afbb92da994e8a11ac14a..f4cbe31de73fbc3828e0b57cefd969e2
|
||||
|
||||
@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 e1407131ceab66bee552e1e2bc8f4ccef668ef62..cd6926096d8daeed159479e06436d9bebfb80026 100644
|
||||
index e207d70a031131217874837198a30d04b9640409..11d0195fb234f6d000efadeeaf48962c81fe701e 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
|
||||
@@ -66,6 +66,11 @@ public class Silverfish extends Monster {
|
||||
@@ -67,6 +67,11 @@ public class Silverfish extends Monster {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.silverfishTakeDamageFromWater;
|
||||
}
|
||||
@@ -885,10 +885,10 @@ index 8ce46cc00a01a678270e906078097aa717abdc41..51c548cd84bd83624fbff3f853a8050d
|
||||
|
||||
@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 f8e39e7b4c5ab3a864a516a8937992874ff2d10a..b7c8ddc09a1761260919dbd3e49389104ce994e7 100644
|
||||
index 9582332f8fb211b41110d0fcda97521c2035ebb3..90c2e4ccc7191a43722c876c3804a829d98e8713 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
|
||||
@@ -142,6 +142,11 @@ public class Slime extends Mob implements Enemy {
|
||||
@@ -140,6 +140,11 @@ public class Slime extends Mob implements Enemy {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.slimeTakeDamageFromWater;
|
||||
}
|
||||
@@ -933,10 +933,10 @@ index 4888502f99e0a9db246f9714a4d7534839bc5487..6f497991cfbb60462a9499d2c43260c6
|
||||
|
||||
public static boolean checkStraySpawnRules(EntityType<Stray> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java
|
||||
index ead0c2c900fbfabef478b200e954d7388860249d..6058679371ec4e4f3b557ea818b625a475b0220b 100644
|
||||
index 5ff3373c9c73691d7f21c05b0f044c198b2bab2d..a7669b3daa4a58a3a6a931de3d86a4fbf937e609 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
|
||||
@@ -122,6 +122,11 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
|
||||
@@ -121,6 +121,11 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
|
||||
public int getPurpurBreedTime() {
|
||||
return this.level.purpurConfig.striderBreedingTicks;
|
||||
}
|
||||
@@ -949,7 +949,7 @@ index ead0c2c900fbfabef478b200e954d7388860249d..6058679371ec4e4f3b557ea818b625a4
|
||||
|
||||
public static boolean checkStriderSpawnRules(EntityType<Strider> type, LevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/Vex.java b/src/main/java/net/minecraft/world/entity/monster/Vex.java
|
||||
index 441357d9a74126a145293193eb02f24e26db3561..c8934f1b0fbac164ce110d44f7697e06834ca275 100644
|
||||
index 429c960ef287e71974be5567374e44a44be09c88..e68fbe7cdaefedb1e59d2e96c6e0755180695a27 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 {
|
||||
@@ -981,7 +981,7 @@ index 729eb8a30b35ef5c70be30b3141b9da5c74388f6..876964a73109bba22584d120fdfd0089
|
||||
|
||||
@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 d6ad32e3622164a35bea1237ec62745588f7f031..723e3961bc72a416b72867c11536eed09f93c267 100644
|
||||
index 801355c7c3a4acfb3c45b0d5bc3218e948f72e10..7a59a1834cf07933215bdee56dda9a94ddd8bd85 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
|
||||
@@ -84,6 +84,11 @@ public class Witch extends Raider implements RangedAttackMob {
|
||||
@@ -1029,7 +1029,7 @@ index 9928af5318c1cc4676c5cf215840ce0f8baf9024..b99419b712b9af385988f1a1271b28f4
|
||||
|
||||
@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 dd879f7f879d42546e84cb2eebcea7c2f6acf8cd..f2ac17f5e4f3f229131f844c1097bb006cb8cf57 100644
|
||||
index 53513758072a117e2938ba9735b99247abf874d8..14ca49e3bb0942b11e1e8bde14b7d37a61627891 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
|
||||
@@ -142,6 +142,11 @@ public class Zombie extends Monster {
|
||||
@@ -1045,10 +1045,10 @@ index dd879f7f879d42546e84cb2eebcea7c2f6acf8cd..f2ac17f5e4f3f229131f844c1097bb00
|
||||
|
||||
@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 1e3969d0a462e5e8270128dbc22a4d09683f3da9..d656fc034212822df8cec3645b02dcfe0f7b9325 100644
|
||||
index 2ed3df59dbbb811a1b2c13c4a6eff9c602371149..f0905d83cd47ee4dbb076515e2a90c97027ed3e9 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
|
||||
@@ -120,6 +120,11 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
|
||||
@@ -124,6 +124,11 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.zombieVillagerTakeDamageFromWater;
|
||||
}
|
||||
@@ -1061,7 +1061,7 @@ index 1e3969d0a462e5e8270128dbc22a4d09683f3da9..d656fc034212822df8cec3645b02dcfe
|
||||
|
||||
@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 ae53d716c25c1cf328231384595049536a50d1bd..7eb4e1e4f6c856657d9a844479fdee0087a96a0c 100644
|
||||
index 918cd5c51849e3de4915016a76bbd4b66c3b8b42..202d5da8bd1345d04a98ac6bc9bbc13fda16dc3e 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
|
||||
@@ -99,6 +99,11 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
|
||||
@@ -1125,10 +1125,10 @@ index e0be095bdff6a9316812715f26772ef4e6e77495..faef3d8204d5d421a55c5dc40677eb9c
|
||||
|
||||
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 6930429c5ac77768d4ef7ad2dc38778b475a8bd4..9755517f0c1d66db5bfd00946114fab5db6776d6 100644
|
||||
index 8a4a18e87f5770addf4316ab9262895780396ba5..6d43867d149b9ce5356d5ad1fbe119de1af212df 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
||||
@@ -191,6 +191,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
|
||||
@@ -193,6 +193,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.villagerTakeDamageFromWater;
|
||||
}
|
||||
@@ -1141,10 +1141,10 @@ index 6930429c5ac77768d4ef7ad2dc38778b475a8bd4..9755517f0c1d66db5bfd00946114fab5
|
||||
|
||||
@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 f3994e53af79a4c3bb327e43cf133a12c20662bf..2acf9de429b75acfe5953628ca503260d6a62656 100644
|
||||
index 8d6930868a42b9fc98d7672bff433ec50d36999e..53bebecd30fee7613af73901b3aa9961982153e2 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
|
||||
@@ -97,6 +97,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
|
||||
@@ -96,6 +96,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.wanderingTraderTakeDamageFromWater;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user