mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 01:47:42 +01:00
Update to 1.18.2
This commit is contained in:
BillyGalbreath
@@ -5,7 +5,7 @@ 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 60737807fd2861db6c4ffb215e23f724407c069a..32211dfd76c03d1eb59929b93eb69cc6adde81ac 100644
|
||||
index ad93a0516391761f6275c2c04cc63f7f20101ba4..e98176b7969589897ee784bfb83f6c3f40cecd68 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 {
|
||||
@@ -21,10 +21,10 @@ index 60737807fd2861db6c4ffb215e23f724407c069a..32211dfd76c03d1eb59929b93eb69cc6
|
||||
|
||||
@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 1fbe37705556e62752be4719994e1cde96f3434d..f6b289cea5962ef56e5c9daa1122989bbabde00e 100644
|
||||
index 70b8698ef3863c957ac4639f113f235705da4667..d4dde82e28200df974b5a084f2d3d7780d8da1bf 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
|
||||
@@ -103,6 +103,11 @@ public class Bat extends AmbientCreature {
|
||||
@@ -102,6 +102,11 @@ public class Bat extends AmbientCreature {
|
||||
this.getAttribute(Attributes.ARMOR_TOUGHNESS).setBaseValue(this.level.purpurConfig.batArmorToughness);
|
||||
this.getAttribute(Attributes.ATTACK_KNOCKBACK).setBaseValue(this.level.purpurConfig.batAttackKnockback);
|
||||
}
|
||||
@@ -37,10 +37,10 @@ index 1fbe37705556e62752be4719994e1cde96f3434d..f6b289cea5962ef56e5c9daa1122989b
|
||||
|
||||
@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 a7dce3d3a0266bacd1883bfe8b47af79defcd95b..8501fd8a512182c7e58894576b54ce16408825a6 100644
|
||||
index c77c9cb3445a9ec807db6f74331e6ee620dd3ff5..ff9ec34962cdcd018a56bd39310b345d0adaf5cd 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
|
||||
@@ -177,7 +177,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
|
||||
@@ -175,7 +175,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
|
||||
// Paper end
|
||||
this.lookControl = new Bee.BeeLookControl(this);
|
||||
this.setPathfindingMalus(BlockPathTypes.DANGER_FIRE, -1.0F);
|
||||
@@ -49,7 +49,7 @@ index a7dce3d3a0266bacd1883bfe8b47af79defcd95b..8501fd8a512182c7e58894576b54ce16
|
||||
this.setPathfindingMalus(BlockPathTypes.WATER_BORDER, 16.0F);
|
||||
this.setPathfindingMalus(BlockPathTypes.COCOA, -1.0F);
|
||||
this.setPathfindingMalus(BlockPathTypes.FENCE, -1.0F);
|
||||
@@ -225,6 +225,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
|
||||
@@ -223,6 +223,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
|
||||
public int getPurpurBreedTime() {
|
||||
return this.level.purpurConfig.beeBreedingTicks;
|
||||
}
|
||||
@@ -62,10 +62,10 @@ index a7dce3d3a0266bacd1883bfe8b47af79defcd95b..8501fd8a512182c7e58894576b54ce16
|
||||
|
||||
@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 0cddd8e8ccd7d7d5c38802116f9aaadb927224c1..66e054e71e0d3cd936c77b212567462e5c6268f2 100644
|
||||
index b4e482a28b1c7f1f46f31faa6466fb54a7991835..44ce32655ce8dcf14b3c2c4d8772ad38b00d0be0 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
|
||||
@@ -155,6 +155,11 @@ public class Cat extends TamableAnimal {
|
||||
@@ -157,6 +157,11 @@ public class Cat extends TamableAnimal {
|
||||
public int getPurpurBreedTime() {
|
||||
return this.level.purpurConfig.catBreedingTicks;
|
||||
}
|
||||
@@ -78,7 +78,7 @@ index 0cddd8e8ccd7d7d5c38802116f9aaadb927224c1..66e054e71e0d3cd936c77b212567462e
|
||||
|
||||
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 1c05400d8638ca14060de1ce26f7cb151487f818..e00f65973622b476e27ae7de5fa8dc8c42ef4af7 100644
|
||||
index 002a66c13074a887b6525085ca57227ff858bac7..d7ddb71ae59ab0a0e10717e5c678ef5e5476aba4 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
|
||||
@@ -80,6 +80,11 @@ public class Chicken extends Animal {
|
||||
@@ -126,10 +126,10 @@ index b063a74327e51b3cd27427426b92ef687c59c94b..00eec3f51e62858e7b85b3340e76bf66
|
||||
|
||||
@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 9ad944839ec143375414fc3e054a2f8cc16814cd..3873fe82ec05f84efadd28ee9f48831b95405de2 100644
|
||||
index 4970823d6bed593a646b3b074fcaf53fd4afadb2..3cc3539f0664eeb048290f4d9b229a5d674fff3c 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
|
||||
@@ -164,6 +164,11 @@ public class Dolphin extends WaterAnimal {
|
||||
@@ -162,6 +162,11 @@ public class Dolphin extends WaterAnimal {
|
||||
public void initAttributes() {
|
||||
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.dolphinMaxHealth);
|
||||
}
|
||||
@@ -142,10 +142,10 @@ index 9ad944839ec143375414fc3e054a2f8cc16814cd..3873fe82ec05f84efadd28ee9f48831b
|
||||
|
||||
@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 cd462190ba900d4cf817967e52a83b68e31722a0..8cdae4fb31b517015e6b154a68b2c37fe76fa127 100644
|
||||
index a1e9a41f2100457f93f21dbcf7bb9ecd53103d9e..d0e9f326e755f1e9e8a9f96f9effba5f80faab1e 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
||||
@@ -187,6 +187,11 @@ public class Fox extends Animal {
|
||||
@@ -188,6 +188,11 @@ public class Fox extends Animal {
|
||||
public int getPurpurBreedTime() {
|
||||
return this.level.purpurConfig.foxBreedingTicks;
|
||||
}
|
||||
@@ -158,7 +158,7 @@ index cd462190ba900d4cf817967e52a83b68e31722a0..8cdae4fb31b517015e6b154a68b2c37f
|
||||
|
||||
@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 4c9ef9c044fbc427ad1ffb2b0f3b1ceda379ae00..13cdc3a97c7707c9cb41e3da6395b0022fd661aa 100644
|
||||
index fe7d88d81d70d46acf031f82495d0503f5b6b5d8..a33b49248a76c84983e98a84efa8a0e1ef6b53d6 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
|
||||
@@ -90,6 +90,11 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
|
||||
@@ -174,10 +174,10 @@ index 4c9ef9c044fbc427ad1ffb2b0f3b1ceda379ae00..13cdc3a97c7707c9cb41e3da6395b002
|
||||
|
||||
@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 ecc5a0c2331609954411c8239392ede20649ec2f..4cfba039e940d8354a04a5ba761a5c0e10e695a3 100644
|
||||
index d7c68775fc39222be66bc82e0e7a1b0ae3238f7a..047404f4e38b9d796ceecb4e07740942eb137ae0 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
|
||||
@@ -90,6 +90,11 @@ public class MushroomCow extends Cow implements Shearable {
|
||||
@@ -89,6 +89,11 @@ public class MushroomCow extends Cow implements Shearable {
|
||||
public int getPurpurBreedTime() {
|
||||
return this.level.purpurConfig.mooshroomBreedingTicks;
|
||||
}
|
||||
@@ -190,10 +190,10 @@ index ecc5a0c2331609954411c8239392ede20649ec2f..4cfba039e940d8354a04a5ba761a5c0e
|
||||
|
||||
@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 d07b0a4a8cf532dd8066e111fab1a64d4b9fd739..23a7b7c259f00ca44616af2e97a360a63cb55120 100644
|
||||
index 5aaeec3df43820bbaa839b9bfd9a756db7377cc2..5442baf10ca180b104bf1fd9cbcc12bb7a6146fc 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
|
||||
@@ -94,6 +94,11 @@ public class Ocelot extends Animal {
|
||||
@@ -93,6 +93,11 @@ public class Ocelot extends Animal {
|
||||
public int getPurpurBreedTime() {
|
||||
return this.level.purpurConfig.ocelotBreedingTicks;
|
||||
}
|
||||
@@ -206,7 +206,7 @@ index d07b0a4a8cf532dd8066e111fab1a64d4b9fd739..23a7b7c259f00ca44616af2e97a360a6
|
||||
|
||||
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 67fa41c69756f234778127dd5a2ff159122da8d5..44302e7f86c45fb10dd9770e214e66512328d821 100644
|
||||
index 83fdc33da473c8ddf69bb20125bf38f6801f8fce..538d52c49ec35653ace723e25adf40217c7ed775 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
||||
@@ -142,6 +142,11 @@ public class Panda extends Animal {
|
||||
@@ -222,10 +222,10 @@ index 67fa41c69756f234778127dd5a2ff159122da8d5..44302e7f86c45fb10dd9770e214e6651
|
||||
|
||||
@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 ac36bd31cc81b48e14f0bb4fc683726b669673be..fcf1b1168b29622ab2b1dc87a947cb66ef8bedfc 100644
|
||||
index 1539668c100352f7e8980f3b9db02b6fb979299b..c35644499f4501fb9d1f2ed3551949a38f3464ca 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
|
||||
@@ -196,6 +196,11 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
|
||||
@@ -194,6 +194,11 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
|
||||
public int getPurpurBreedTime() {
|
||||
return 6000;
|
||||
}
|
||||
@@ -238,7 +238,7 @@ index ac36bd31cc81b48e14f0bb4fc683726b669673be..fcf1b1168b29622ab2b1dc87a947cb66
|
||||
|
||||
@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 3b4ad2199f40fbf902948545908247c805a3f1fa..479570e9f98404ac01ef08ce81ef200340cea602 100644
|
||||
index 93f670fe1512ec18272c2e4d71735bcbdbc87eda..a24dffe25615c9c9a4b641b291ce735e3f1dd6b7 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,10 +254,10 @@ index 3b4ad2199f40fbf902948545908247c805a3f1fa..479570e9f98404ac01ef08ce81ef2003
|
||||
|
||||
@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 de109bea3e132e08743f0a26f18262ee9a4982bd..753642045e2594d67887a766a8b6c477767a6edb 100644
|
||||
index 0f4a0e50e701c3fb75536e0b6d7821046e7f8f66..3fe05be69cada8df7553ee0fb9828e5ec593f54f 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
|
||||
@@ -125,6 +125,11 @@ public class PolarBear extends Animal implements NeutralMob {
|
||||
@@ -123,6 +123,11 @@ public class PolarBear extends Animal implements NeutralMob {
|
||||
public int getPurpurBreedTime() {
|
||||
return this.level.purpurConfig.polarBearBreedingTicks;
|
||||
}
|
||||
@@ -270,7 +270,7 @@ index de109bea3e132e08743f0a26f18262ee9a4982bd..753642045e2594d67887a766a8b6c477
|
||||
|
||||
@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 e42a7552d17f883b7116a180e408880c5fdb29d0..413f2491aad79409f4ac0759f7b649f1367376a5 100644
|
||||
index 988093b46a4c386f8d47a4c530b8e9f6f49efd0d..2a9af6af653dc62c99baff01ebea8ad64ff62fe0 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 {
|
||||
@@ -286,10 +286,10 @@ index e42a7552d17f883b7116a180e408880c5fdb29d0..413f2491aad79409f4ac0759f7b649f1
|
||||
|
||||
@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 2beb1421a2dc11c35f83ccff80e8f87e7bafe54a..b3c258b2e46433645b706b5a43012094f584abe0 100644
|
||||
index 3e1f6392853f7770a3a3427444ecc9c5fe039a63..dba2e1d677d7ac26517736cfbe2ee9d742fa4482 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 {
|
||||
@@ -146,6 +146,11 @@ public class Rabbit extends Animal {
|
||||
public int getPurpurBreedTime() {
|
||||
return this.level.purpurConfig.rabbitBreedingTicks;
|
||||
}
|
||||
@@ -334,7 +334,7 @@ index 86f398fc79dcc5dd24a61483d292e228dd6ab83b..4fa8e4a298a98b2a41ef7572d21ed50a
|
||||
|
||||
@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 bf9256fb8d50259fe099d6f4a2b945bee81b0d03..5695cdb6a621d24a3795220a66ea94dfa1dbba52 100644
|
||||
index d87b5f8478bca172c233b84f4f4ac0b3b9a87692..734b1314f148e0f92559be1dc1970613b313975f 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 bf9256fb8d50259fe099d6f4a2b945bee81b0d03..5695cdb6a621d24a3795220a66ea94df
|
||||
|
||||
@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 8381937f208a30ca492a69470cf89b1b2621657f..49c043efc3f88ea9c5339e5011de80d2d42906c5 100644
|
||||
index 4850960c7c4f38c7d81b8945f8c87504d5ccd0d0..7a8f8be052dc3ee6dc56dd39017e11488af0a8ff 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
|
||||
@@ -96,6 +96,11 @@ public class Squid extends WaterAnimal {
|
||||
@@ -95,6 +95,11 @@ public class Squid extends WaterAnimal {
|
||||
public boolean isInWater() {
|
||||
return this.wasTouchingWater || canFly();
|
||||
}
|
||||
@@ -363,10 +363,10 @@ index 8381937f208a30ca492a69470cf89b1b2621657f..49c043efc3f88ea9c5339e5011de80d2
|
||||
|
||||
@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 9979a1c75ad6d420575b80413a7b49c51c5ae5c1..5b8a6b2705c6f317e4e48e7a9183b140489c355a 100644
|
||||
index f570600ca77b1b48e879198095ea54e692f3d243..206729081b8316ac76a808ec509a7aee4d6831f7 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
|
||||
@@ -70,6 +70,11 @@ public class TropicalFish extends AbstractSchoolingFish {
|
||||
@@ -69,6 +69,11 @@ public class TropicalFish extends AbstractSchoolingFish {
|
||||
public void initAttributes() {
|
||||
this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.tropicalFishMaxHealth);
|
||||
}
|
||||
@@ -379,10 +379,10 @@ index 9979a1c75ad6d420575b80413a7b49c51c5ae5c1..5b8a6b2705c6f317e4e48e7a9183b140
|
||||
|
||||
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 69cdf5540c654d730f4fc45e418c4c2ae532d2bc..e8e317c822a73b98545f3cf6e36aa284937e8c5b 100644
|
||||
index e3bf2c2bc16bc03c17d90f2ce1620c6b895e9bf7..3c38345b32d106a169d1e6abcae54f282d08fe89 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
|
||||
@@ -111,6 +111,11 @@ public class Turtle extends Animal {
|
||||
@@ -109,6 +109,11 @@ public class Turtle extends Animal {
|
||||
public int getPurpurBreedTime() {
|
||||
return this.level.purpurConfig.turtleBreedingTicks;
|
||||
}
|
||||
@@ -395,10 +395,10 @@ index 69cdf5540c654d730f4fc45e418c4c2ae532d2bc..e8e317c822a73b98545f3cf6e36aa284
|
||||
|
||||
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 0ded0de33fb53d827f2cdbfa5472c3469ee5a329..8c4ef7de3dfa2888ea175342a8df308a0a1fa66d 100644
|
||||
index b9567d4d6c03124d4eaa3194c97a170277c64bbe..8ca97562ef182a461b4dccdd2eb68dc919fc3634 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
||||
@@ -204,6 +204,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
|
||||
@@ -207,6 +207,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
|
||||
setCollarColor(level.purpurConfig.wolfDefaultCollarColor);
|
||||
super.tame(player);
|
||||
}
|
||||
@@ -411,10 +411,10 @@ index 0ded0de33fb53d827f2cdbfa5472c3469ee5a329..8c4ef7de3dfa2888ea175342a8df308a
|
||||
|
||||
@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 ea1fba058b28631a85dd5ec6153620d67c4ca5f2..dc84d044aa7533d31c48ed80e49c44951320cb5e 100644
|
||||
index a554d836635826bbe3fc562675ae982f33b409d1..b7e2ed08864f5bde346faebf9498254dc9794ce6 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
|
||||
@@ -127,6 +127,11 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
|
||||
@@ -129,6 +129,11 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
|
||||
public int getPurpurBreedTime() {
|
||||
return this.level.purpurConfig.axolotlBreedingTicks;
|
||||
}
|
||||
@@ -427,10 +427,10 @@ index ea1fba058b28631a85dd5ec6153620d67c4ca5f2..dc84d044aa7533d31c48ed80e49c4495
|
||||
|
||||
@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 ca545e7337ff58654f136d1edd8588bf92ca4977..dbfb6aa819d7bb86c60268daf9cf0b5a5200c5b1 100644
|
||||
index a697a094679c61e357177bc22e628c347b39a4d9..02146c9b5d64ed84869f946638f639d3cd176e5e 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
|
||||
@@ -99,6 +99,11 @@ public class Goat extends Animal {
|
||||
@@ -94,6 +94,11 @@ public class Goat extends Animal {
|
||||
public int getPurpurBreedTime() {
|
||||
return this.level.purpurConfig.goatBreedingTicks;
|
||||
}
|
||||
@@ -475,10 +475,10 @@ index 2c5cb1b759a0b6e0233345da5a968288ec338837..16755249c4700fa59f704b7c88e3490d
|
||||
|
||||
@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 fe6ce743b51c1ff74e8a1233cf0217c048b8577c..a5463330e6b20dcbf8a82bfb0821412f7c409b1d 100644
|
||||
index 5553cffdbaf308c543d0afed467acd3e6a0f8956..f90f890c8a537be1912e9f131d1866cffcb580e1 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
|
||||
@@ -137,6 +137,11 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
|
||||
@@ -136,6 +136,11 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
|
||||
public int getPurpurBreedTime() {
|
||||
return this.level.purpurConfig.llamaBreedingTicks;
|
||||
}
|
||||
@@ -555,10 +555,10 @@ index b6d9ba8dd5694952ca2eba54726ac5e587175250..88da7a365c28e2d097d0a7bff30ea1ac
|
||||
|
||||
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 ee9cdd91a969e94b36ddb4cf06b15118d5d7204b..613a847d939349d0b5db34f058865a16d772fadc 100644
|
||||
index b22f3839107e80d4c802475d7d56d52c267046c6..e288eb271a40c7da9971c59131188eedd70d67c5 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
|
||||
@@ -164,6 +164,11 @@ public class EnderDragon extends Mob implements Enemy {
|
||||
@@ -162,6 +162,11 @@ public class EnderDragon extends Mob implements Enemy {
|
||||
public void initAttributes() {
|
||||
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.enderDragonMaxHealth);
|
||||
}
|
||||
@@ -571,10 +571,10 @@ index ee9cdd91a969e94b36ddb4cf06b15118d5d7204b..613a847d939349d0b5db34f058865a16
|
||||
|
||||
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 99b901f1ee202213dae3ab1930342920bbfe3d7a..93a431247b28bcb8cc974f2dfafe1daba440bc48 100644
|
||||
index 87aaad12386b0ad79b1017100c83ca0482a9e304..1aadac665d7389431d819f72bb05af82a4d08b8c 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
|
||||
@@ -223,6 +223,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
|
||||
@@ -222,6 +222,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
|
||||
public void initAttributes() {
|
||||
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.witherMaxHealth);
|
||||
}
|
||||
@@ -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 dee1c40e557c9103fd90e92ee891f266db8700c1..7c683693a806142c098dd31e6bc88a0b0a33ec66 100644
|
||||
index a042155bd2075d861343760a5c61ab53795d29af..d3696a9182613d17188c5c01a554b26522a6e7e8 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
|
||||
@@ -151,6 +151,11 @@ public class Creeper extends Monster implements PowerableMob {
|
||||
@@ -641,10 +641,10 @@ index dee1c40e557c9103fd90e92ee891f266db8700c1..7c683693a806142c098dd31e6bc88a0b
|
||||
|
||||
@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 d49e0f8e7842e4f5fb9f97fc8ea760910a1edd52..a2f71b1ba0df62910df528103e8695a2762fe1df 100644
|
||||
index 3dd6dd92f5f8334b43f50447ac259b2d06f9af95..8a68469769cfe8ac596b3f2c990e0375d7d1dcaf 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
|
||||
@@ -109,6 +109,11 @@ public class Drowned extends Zombie implements RangedAttackMob {
|
||||
@@ -107,6 +107,11 @@ public class Drowned extends Zombie implements RangedAttackMob {
|
||||
public boolean jockeyTryExistingChickens() {
|
||||
return level.purpurConfig.drownedJockeyTryExistingChickens;
|
||||
}
|
||||
@@ -673,10 +673,10 @@ index 25fab7497a80a8fa65bd9cd9bdb0cd498f240bd1..2800594fea055d75268531d8ad3fef99
|
||||
|
||||
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 8f8a5db7231c1ec69ac8b94b16447321fc89618a..eb0c73cb96e94079ac010c8ae4999206ad988cdf 100644
|
||||
index 48fc2c978ffadbc3a3728adc60c35cc743d5b024..2c637e8e93c553d51b2467de64b9d0b9bf9b8381 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
|
||||
@@ -85,7 +85,7 @@ public class EnderMan extends Monster implements NeutralMob {
|
||||
@@ -84,7 +84,7 @@ public class EnderMan extends Monster implements NeutralMob {
|
||||
public EnderMan(EntityType<? extends EnderMan> type, Level world) {
|
||||
super(type, world);
|
||||
this.maxUpStep = 1.0F;
|
||||
@@ -685,7 +685,7 @@ index 8f8a5db7231c1ec69ac8b94b16447321fc89618a..eb0c73cb96e94079ac010c8ae4999206
|
||||
}
|
||||
|
||||
// Purpur start
|
||||
@@ -298,7 +298,7 @@ public class EnderMan extends Monster implements NeutralMob {
|
||||
@@ -297,7 +297,7 @@ public class EnderMan extends Monster implements NeutralMob {
|
||||
|
||||
@Override
|
||||
public boolean isSensitiveToWater() {
|
||||
@@ -695,10 +695,10 @@ index 8f8a5db7231c1ec69ac8b94b16447321fc89618a..eb0c73cb96e94079ac010c8ae4999206
|
||||
|
||||
@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 6d47413b56b9d8b195b6087e39048b6ad5ce477f..35108f25aac196b2c8ba2cf91a6744831e93a0b3 100644
|
||||
index 2d43bdae159f1345f1f50bb9b0c5aebffa33ed96..31cfaa059dc8df86027950e5db651560fcd51d32 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
|
||||
@@ -56,6 +56,11 @@ public class Endermite extends Monster {
|
||||
@@ -57,6 +57,11 @@ public class Endermite extends Monster {
|
||||
public void initAttributes() {
|
||||
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.endermiteMaxHealth);
|
||||
}
|
||||
@@ -711,7 +711,7 @@ index 6d47413b56b9d8b195b6087e39048b6ad5ce477f..35108f25aac196b2c8ba2cf91a674483
|
||||
|
||||
@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 f64f61e189baab82eb93891313106cc2d8edc8d3..6c3af9c64f9622150928da09ce8318c21d450b74 100644
|
||||
index 281e8e6232c30cf5c20e9e2de4ac2ab4d0722ccf..912c594c2a5df21663b26da81cc3d78b37055a6a 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 {
|
||||
@@ -807,7 +807,7 @@ index 171e2fef10ac75dd4585a82057edb4452a6f0d22..5b6a61fb2b44ea4dec4767958a2abe57
|
||||
|
||||
@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 d4ce48a99fad5e9a26f8e057d91c712b8d8623b0..d5039d0a5e8a35cb7ce43792c909b21d1b0986f2 100644
|
||||
index a9c8dd788affd122d98bc9a2eef068c5fb9a58ba..b7b4e5173e0f6da888746f1d1679cbde43905bf0 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
|
||||
@@ -67,6 +67,11 @@ public class MagmaCube extends Slime {
|
||||
@@ -823,7 +823,7 @@ index d4ce48a99fad5e9a26f8e057d91c712b8d8623b0..d5039d0a5e8a35cb7ce43792c909b21d
|
||||
|
||||
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 5d9e6945ebdda73a77f048dfb91bfeb561e0eb5f..3122f7b826605f171bc1c88de89b358bd2e7118c 100644
|
||||
index 2be9ab670e93067fe23745cafa0655a1dfa2bc0f..e7e4d87fb8a5276fd617afc4e0b925100abf3f76 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 {
|
||||
@@ -887,10 +887,10 @@ index 545ca8ada7ef9cff3619d2a556ddbd01742703f1..ae22748c9cefd000986d50e12fa9cb2a
|
||||
|
||||
@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 25946b0171fd4c9bde91ecf0cb664861e71af4f8..e1407131ceab66bee552e1e2bc8f4ccef668ef62 100644
|
||||
index d929193ed63b36deb32cc0807e75a589a0d8ad5c..e207d70a031131217874837198a30d04b9640409 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
|
||||
@@ -61,6 +61,11 @@ public class Silverfish extends Monster {
|
||||
@@ -62,6 +62,11 @@ public class Silverfish extends Monster {
|
||||
public void initAttributes() {
|
||||
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.silverfishMaxHealth);
|
||||
}
|
||||
@@ -919,10 +919,10 @@ index e239bcc4d4afe48e9fc204ad38d8bc76833994f4..8ce46cc00a01a678270e906078097aa7
|
||||
|
||||
@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 d7779ad6b6ce502468f104e35a715bf8fc013cff..f8e39e7b4c5ab3a864a516a8937992874ff2d10a 100644
|
||||
index b1894c88682201ed5fca5e98bedab73b4b08a065..9582332f8fb211b41110d0fcda97521c2035ebb3 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
|
||||
@@ -137,6 +137,11 @@ public class Slime extends Mob implements Enemy {
|
||||
@@ -135,6 +135,11 @@ public class Slime extends Mob implements Enemy {
|
||||
}
|
||||
return value;
|
||||
}
|
||||
@@ -967,10 +967,10 @@ index b54368f53d3cf87f35132f811f8a917999968c1e..4888502f99e0a9db246f9714a4d75348
|
||||
|
||||
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 cfa355d99d5f8aaefe4cf0c10805ef7b51a0224a..a58800a7b06f662c7b3fc876ae78fb2880d3ddbc 100644
|
||||
index bec84c1dba34d61de9199b1b46cad49d46ee9731..5ff3373c9c73691d7f21c05b0f044c198b2bab2d 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
|
||||
@@ -91,7 +91,7 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
|
||||
@@ -90,7 +90,7 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
|
||||
super(type, world);
|
||||
this.steering = new ItemBasedSteering(this.entityData, Strider.DATA_BOOST_TIME, Strider.DATA_SADDLE_ID);
|
||||
this.blocksBuilding = true;
|
||||
@@ -979,7 +979,7 @@ index cfa355d99d5f8aaefe4cf0c10805ef7b51a0224a..a58800a7b06f662c7b3fc876ae78fb28
|
||||
this.setPathfindingMalus(BlockPathTypes.LAVA, 0.0F);
|
||||
this.setPathfindingMalus(BlockPathTypes.DANGER_FIRE, 0.0F);
|
||||
this.setPathfindingMalus(BlockPathTypes.DAMAGE_FIRE, 0.0F);
|
||||
@@ -413,7 +413,7 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
|
||||
@@ -412,7 +412,7 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
|
||||
|
||||
@Override
|
||||
public boolean isSensitiveToWater() {
|
||||
@@ -989,7 +989,7 @@ index cfa355d99d5f8aaefe4cf0c10805ef7b51a0224a..a58800a7b06f662c7b3fc876ae78fb28
|
||||
|
||||
@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 b223b48215adcd57ea9656194df3b5673a82586b..441357d9a74126a145293193eb02f24e26db3561 100644
|
||||
index 1614109a5492d46c26552f2f5e3a510d82e31dc1..429c960ef287e71974be5567374e44a44be09c88 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 {
|
||||
@@ -1021,7 +1021,7 @@ index acd4e282841708d7ef0145757899e355a6410a4a..729eb8a30b35ef5c70be30b3141b9da5
|
||||
|
||||
@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 33d6aba40c6523cb271946bac98c6e84593a2c6b..d6ad32e3622164a35bea1237ec62745588f7f031 100644
|
||||
index 0359db7ccca286df046066b4a2356a50b8240a56..801355c7c3a4acfb3c45b0d5bc3218e948f72e10 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
|
||||
@@ -79,6 +79,11 @@ public class Witch extends Raider implements RangedAttackMob {
|
||||
@@ -1069,7 +1069,7 @@ index a91ec2e385940b12bc41d9c09819c9081edc5c44..9928af5318c1cc4676c5cf215840ce0f
|
||||
|
||||
@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 b59894aaa9553bf78b98a6fce7fb624088389011..4b288fe8923bb4beefb88e8196bfb4d5d2b10b8b 100644
|
||||
index eaffa791ce73f6b2c2fa5b940909346e9f0fda0f..15bbf62f1dab73b501044c6ada0f6f3b09ab07df 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
|
||||
@@ -136,6 +136,11 @@ public class Zombie extends Monster {
|
||||
@@ -1085,10 +1085,10 @@ index b59894aaa9553bf78b98a6fce7fb624088389011..4b288fe8923bb4beefb88e8196bfb4d5
|
||||
|
||||
@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 cad1a9be238aa62b4eb0ec02d4155d15c0cc5378..92d527081abd35acc646f66a0714f2dc01706dfe 100644
|
||||
index b925e0ffbdc8f388a7b2162284e8356c3e969454..ba6875089c122baaf99f21cda5c65228c78e0fa1 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
|
||||
@@ -115,6 +115,11 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
|
||||
@@ -119,6 +119,11 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
|
||||
public boolean jockeyTryExistingChickens() {
|
||||
return level.purpurConfig.zombieVillagerJockeyTryExistingChickens;
|
||||
}
|
||||
@@ -1101,7 +1101,7 @@ index cad1a9be238aa62b4eb0ec02d4155d15c0cc5378..92d527081abd35acc646f66a0714f2dc
|
||||
|
||||
@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 ecf0b5def569f6c37d0a27ceb51e7158e57cbe6b..ae53d716c25c1cf328231384595049536a50d1bd 100644
|
||||
index 21610fa723b22894a4ff316ee34d8aabfb707526..918cd5c51849e3de4915016a76bbd4b66c3b8b42 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
|
||||
@@ -94,6 +94,11 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
|
||||
@@ -1165,10 +1165,10 @@ index ec532ba1ccb0dbe50b91ba698a4f30d5bc89ca82..e0be095bdff6a9316812715f26772ef4
|
||||
|
||||
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 72f067f1d88a77b9ad571bac84cecf10cc63c975..6fe8ebc19470425dd5e44b67b0c6b369a1e21365 100644
|
||||
index bbb8dde583b1a40c305bb110313e7121ad354dc3..c926a513490b91e83802ab1aea6db90b93acd206 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
||||
@@ -186,6 +186,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
|
||||
@@ -188,6 +188,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
|
||||
public boolean canBeLeashed(Player player) {
|
||||
return level.purpurConfig.villagerCanBeLeashed && !this.isLeashed();
|
||||
}
|
||||
@@ -1181,10 +1181,10 @@ index 72f067f1d88a77b9ad571bac84cecf10cc63c975..6fe8ebc19470425dd5e44b67b0c6b369
|
||||
|
||||
@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 00a19fc46b4ffecfcfb591a17c7c3608f014d7c8..d99e97d5a7291df541a939c0f21297d8c3976138 100644
|
||||
index 8756e0d8d0077308f5fb74bf45fe093d0f043c99..6dd8856816bebb2766203589048cc68b3f5c8f5c 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
|
||||
@@ -92,6 +92,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
|
||||
@@ -91,6 +91,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
|
||||
public boolean canBeLeashed(Player player) {
|
||||
return level.purpurConfig.wanderingTraderCanBeLeashed && !this.isLeashed();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user