mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 08:57:44 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: 2780e94 Fix PaperTickList (#6241) b854e7e Drop unneeded patch (#6240) 2961b2a Fix various mob drops being captured as death drops (#5675) 3801a39 Add ItemRarity test (#6247) 170382f Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6245)
This commit is contained in:
William Blake Galbreath
@@ -34,7 +34,7 @@ index be1bc7fda4104d61f91c2815c6ba3c612a019bed..2ede76a55c72840d915ed282609b1ca1
|
||||
|
||||
this.profiler.push(() -> {
|
||||
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
index 631bc406d9bb193ac2d1d433519c2c3a7f4589e4..7c45fdbd9f389e8b74de5a672a9520ede93d6217 100644
|
||||
index f9ed48f5bbde84fd1804e482f2777b516cc3a1ef..29b841462037fa97f72971c490b617d18be53160 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
@@ -201,6 +201,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
||||
@@ -46,7 +46,7 @@ index 631bc406d9bb193ac2d1d433519c2c3a7f4589e4..7c45fdbd9f389e8b74de5a672a9520ed
|
||||
return new Throwable(entity + " Added to world at " + new java.util.Date());
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
index 57200e6b419ab0793df6498467325b6d5690c17f..bd787b4122502eacacadd8d47ea5aa5dc5e023e5 100644
|
||||
index 9d759979372d83ddf203a8b6d52202d461136ecd..ac44d1c07ba6922d25592d750af326d34b625cec 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
@@ -664,6 +664,15 @@ public class ServerPlayer extends Player {
|
||||
@@ -86,7 +86,7 @@ index b5b1aab39f881c334aa7f5f0d713f78f7265f41b..757c9f9800de18ca8ece3583222c7d3a
|
||||
if ((entity instanceof AbstractFish && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
|
||||
ServerGamePacketListenerImpl.this.send(new ClientboundAddMobPacket((AbstractFish) entity));
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
index 3d50e17f13a9c9678b8d912f874096fbd28a42ee..e47673d410936068ceff8b757050cc6c8a15816c 100644
|
||||
index 28d7e18c9b53b7563b9c4af9afde4e1261d454e4..08efd9b12786077e4f6ae1bfffb912d317f4f418 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -230,7 +230,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
||||
@@ -262,7 +262,7 @@ index 24c629d5f26bc5aadebcf39a63930b3448525242..28139fd78e7dfb703e941a46bd18e023
|
||||
// Paper end
|
||||
if (!this.level.isClientSide && this.isSensitiveToWater() && this.isInWaterRainOrBubble()) {
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
|
||||
index f8c6d88d6bf71e7bc46b5f44e688229da5fd3da2..2a310cb6cc1bfbf0c8d65c96b6bdbe8450d7c3ce 100644
|
||||
index 5eb93bacd303ebed0a702221f8ae31631d42f45d..c8dee3a9a5cafc9f0fd88becd843823836cd19b3 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Mob.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
|
||||
@@ -140,6 +140,8 @@ public abstract class Mob extends LivingEntity {
|
||||
@@ -274,7 +274,7 @@ index f8c6d88d6bf71e7bc46b5f44e688229da5fd3da2..2a310cb6cc1bfbf0c8d65c96b6bdbe84
|
||||
this.jumpControl = new JumpControl(this);
|
||||
this.bodyRotationControl = this.createBodyControl();
|
||||
this.navigation = this.createNavigation(world);
|
||||
@@ -1279,7 +1281,7 @@ public abstract class Mob extends LivingEntity {
|
||||
@@ -1283,7 +1285,7 @@ public abstract class Mob extends LivingEntity {
|
||||
protected void onOffspringSpawnedFromEgg(Player player, Mob child) {}
|
||||
|
||||
protected InteractionResult mobInteract(Player player, InteractionHand hand) {
|
||||
@@ -283,7 +283,7 @@ index f8c6d88d6bf71e7bc46b5f44e688229da5fd3da2..2a310cb6cc1bfbf0c8d65c96b6bdbe84
|
||||
}
|
||||
|
||||
public boolean isWithinRestriction() {
|
||||
@@ -1638,4 +1640,52 @@ public abstract class Mob extends LivingEntity {
|
||||
@@ -1644,4 +1646,52 @@ public abstract class Mob extends LivingEntity {
|
||||
|
||||
return itemmonsteregg == null ? null : new ItemStack(itemmonsteregg);
|
||||
}
|
||||
@@ -573,7 +573,7 @@ index 153194d937d210e2e4fd8864e4a3c000f85d7e2e..5708a1f88f3e62856a5ec15dc71d8a16
|
||||
BlockPos blockposition = this.blockPosition();
|
||||
BlockPos blockposition1 = blockposition.above();
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java b/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
|
||||
index 17b54ac18ef862f0f39da2b3b48c8bb86d970744..c0413ad13bf13e981f460e65b3ebf499a6eb32b6 100644
|
||||
index fc0cd86397b12e42756273a0317164d79ac51937..4243c4d3479210e392a1246337a3daabee5629d7 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
|
||||
@@ -108,12 +108,9 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
|
||||
@@ -807,7 +807,7 @@ index 15773d61deb357917e2478f0731f0b470669b8f0..14822b20971b63290a7022f8efe65693
|
||||
Item item = itemstack.getItem();
|
||||
|
||||
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 8460bed561c09a647f6e0209f7c5448e5a42b281..771e55cceaf17167c00554b1be7043a4cb3efb7e 100644
|
||||
index cece07e000a4355e88aef7848fd264191521484e..7a5119e007d69adc9a77fbd167a8d19a9c71c6ff 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
|
||||
@@ -52,9 +52,22 @@ public class Chicken extends Animal {
|
||||
@@ -1256,7 +1256,7 @@ index 06bf44ceb6f959a99f268fe1e1dca494985fbf4e..2a8f6d920370b4087895e9f0098a0f41
|
||||
this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, false, false, Turtle.BABY_ON_LAND_SELECTOR));
|
||||
}
|
||||
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 851ee58e52c6003d6ae7b58c9b6b9a9a9795fa85..4591b67537aa95ce0a7e6ad838b7db9da80346cc 100644
|
||||
index 12ed864bedf2201fad68e2aeba249c3c18a12444..fa9dbb22dd13c650ef08af6030d60c5fc8ee8044 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
||||
@@ -108,6 +108,27 @@ public class Panda extends Animal {
|
||||
@@ -1303,7 +1303,7 @@ index 851ee58e52c6003d6ae7b58c9b6b9a9a9795fa85..4591b67537aa95ce0a7e6ad838b7db9d
|
||||
this.targetSelector.addGoal(1, (new Panda.PandaHurtByTargetGoal(this, new Class[0])).setAlertOthers(new Class[0]));
|
||||
}
|
||||
|
||||
@@ -615,7 +638,7 @@ public class Panda extends Animal {
|
||||
@@ -617,7 +640,7 @@ public class Panda extends Animal {
|
||||
ItemStack itemstack = player.getItemInHand(hand);
|
||||
|
||||
if (this.isScared()) {
|
||||
@@ -1312,7 +1312,7 @@ index 851ee58e52c6003d6ae7b58c9b6b9a9a9795fa85..4591b67537aa95ce0a7e6ad838b7db9d
|
||||
} else if (this.isOnBack()) {
|
||||
this.setOnBack(false);
|
||||
return InteractionResult.sidedSuccess(this.level.isClientSide);
|
||||
@@ -634,7 +657,7 @@ public class Panda extends Animal {
|
||||
@@ -636,7 +659,7 @@ public class Panda extends Animal {
|
||||
this.gameEvent(GameEvent.MOB_INTERACT, this.eyeBlockPosition());
|
||||
} else {
|
||||
if (this.level.isClientSide || this.isSitting() || this.isInWater()) {
|
||||
@@ -1321,7 +1321,7 @@ index 851ee58e52c6003d6ae7b58c9b6b9a9a9795fa85..4591b67537aa95ce0a7e6ad838b7db9d
|
||||
}
|
||||
|
||||
this.tryToSit();
|
||||
@@ -651,7 +674,7 @@ public class Panda extends Animal {
|
||||
@@ -653,7 +676,7 @@ public class Panda extends Animal {
|
||||
|
||||
return InteractionResult.SUCCESS;
|
||||
} else {
|
||||
@@ -1330,7 +1330,7 @@ index 851ee58e52c6003d6ae7b58c9b6b9a9a9795fa85..4591b67537aa95ce0a7e6ad838b7db9d
|
||||
}
|
||||
}
|
||||
|
||||
@@ -691,7 +714,7 @@ public class Panda extends Animal {
|
||||
@@ -693,7 +716,7 @@ public class Panda extends Animal {
|
||||
return !this.isOnBack() && !this.isScared() && !this.isEating() && !this.isRolling() && !this.isSitting();
|
||||
}
|
||||
|
||||
@@ -1339,7 +1339,7 @@ index 851ee58e52c6003d6ae7b58c9b6b9a9a9795fa85..4591b67537aa95ce0a7e6ad838b7db9d
|
||||
|
||||
private final Panda panda;
|
||||
|
||||
@@ -701,9 +724,9 @@ public class Panda extends Animal {
|
||||
@@ -703,9 +726,9 @@ public class Panda extends Animal {
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -1739,7 +1739,7 @@ index 9315c34e61aa0432175385736de51f1bfdafbf85..5890bf8aa714dc219059bca4950a1b5b
|
||||
this.goalSelector.addGoal(2, new BreedGoal(this, 1.0D));
|
||||
this.goalSelector.addGoal(3, new TemptGoal(this, 1.1D, Ingredient.of(Items.WHEAT), false));
|
||||
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 2631f08496c8e45874b22760b559a91b7b2bf415..a76f3c1c409dc96f7033be8a7eeb06617053735b 100644
|
||||
index 8c2f447d0d307df35d84b4907000023eb82ac6c2..229b3cc63d2ec0bc5e5797d45efd9ca45f3ea82a 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
|
||||
@@ -53,12 +53,26 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
|
||||
@@ -2012,7 +2012,7 @@ index 80caabee4d2100208f117a1c3e35247b65e318ad..bca3300e06d6eb0c6acdfb11d715a1e8
|
||||
this.targetSelector.addGoal(2, new OwnerHurtTargetGoal(this));
|
||||
this.targetSelector.addGoal(3, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers(new Class[0])); // CraftBukkit - decompile error
|
||||
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 c72819b03f9339dadd691155f196f6744f14da75..06c831f1a4b5159afadecff4a25248397ecbd2c7 100644
|
||||
index fa365420a4593bc7d652b0d92f4750602fcb334b..0c2dbff44ec7238c051850976a5f1fd565f35258 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
|
||||
@@ -90,6 +90,23 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
|
||||
@@ -3215,10 +3215,10 @@ index 0d578ab12c874bd2daccc4322a3fe1abafa4bc18..d95b110a025d48e7ab18f172e4555937
|
||||
protected float getStandingEyeHeight(Pose pose, EntityDimensions dimensions) {
|
||||
return 10.440001F;
|
||||
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 012e43aa6e2f6e4970257988620ab76d0f75f494..4aaad673f49988be6470b817d42f3fc4e6936400 100644
|
||||
index c5441f2784463b35fefbb567bf4eca579b3769bb..20b7104b7fd38b3c6c05a68a1472c6006814cb81 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Guardian.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
|
||||
@@ -63,14 +63,35 @@ public class Guardian extends Monster {
|
||||
@@ -65,15 +65,36 @@ public class Guardian extends Monster {
|
||||
this.xpReward = 10;
|
||||
this.setPathfindingMalus(BlockPathTypes.WATER, 0.0F);
|
||||
this.moveControl = new Guardian.GuardianMoveControl(this);
|
||||
@@ -3248,21 +3248,22 @@ index 012e43aa6e2f6e4970257988620ab76d0f75f494..4aaad673f49988be6470b817d42f3fc4
|
||||
+
|
||||
@Override
|
||||
protected void registerGoals() {
|
||||
MoveTowardsRestrictionGoal moveTowardsRestrictionGoal = new MoveTowardsRestrictionGoal(this, 1.0D);
|
||||
MoveTowardsRestrictionGoal pathfindergoalmovetowardsrestriction = new MoveTowardsRestrictionGoal(this, 1.0D);
|
||||
|
||||
this.randomStrollGoal = new RandomStrollGoal(this, 1.0D, 80);
|
||||
+ this.goalSelector.addGoal(0, new net.pl3x.purpur.entity.ai.HasRider(this)); // Purpur
|
||||
this.goalSelector.addGoal(4, new Guardian.GuardianAttackGoal(this));
|
||||
this.goalSelector.addGoal(5, moveTowardsRestrictionGoal);
|
||||
this.goalSelector.addGoal(5, pathfindergoalmovetowardsrestriction);
|
||||
this.goalSelector.addGoal(7, this.randomStrollGoal);
|
||||
@@ -79,6 +100,7 @@ public class Guardian extends Monster {
|
||||
@@ -82,6 +103,7 @@ public class Guardian extends Monster {
|
||||
this.goalSelector.addGoal(9, new RandomLookAroundGoal(this));
|
||||
this.randomStrollGoal.setFlags(EnumSet.of(Goal.Flag.MOVE, Goal.Flag.LOOK));
|
||||
moveTowardsRestrictionGoal.setFlags(EnumSet.of(Goal.Flag.MOVE, Goal.Flag.LOOK));
|
||||
pathfindergoalmovetowardsrestriction.setFlags(EnumSet.of(Goal.Flag.MOVE, Goal.Flag.LOOK));
|
||||
+ this.targetSelector.addGoal(0, new net.pl3x.purpur.entity.ai.HasRider(this)); // Purpur
|
||||
this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, LivingEntity.class, 10, true, false, new Guardian.GuardianAttackSelector(this)));
|
||||
}
|
||||
|
||||
@@ -328,7 +350,7 @@ public class Guardian extends Monster {
|
||||
@@ -337,7 +359,7 @@ public class Guardian extends Monster {
|
||||
@Override
|
||||
public void travel(Vec3 movementInput) {
|
||||
if (this.isEffectiveAi() && this.isInWater()) {
|
||||
@@ -3271,16 +3272,17 @@ index 012e43aa6e2f6e4970257988620ab76d0f75f494..4aaad673f49988be6470b817d42f3fc4
|
||||
this.move(MoverType.SELF, this.getDeltaMovement());
|
||||
this.setDeltaMovement(this.getDeltaMovement().scale(0.9D));
|
||||
if (!this.isMoving() && this.getTarget() == null) {
|
||||
@@ -424,7 +446,7 @@ public class Guardian extends Monster {
|
||||
}
|
||||
@@ -349,8 +371,7 @@ public class Guardian extends Monster {
|
||||
|
||||
}
|
||||
|
||||
- static class GuardianMoveControl extends MoveControl {
|
||||
+ static class GuardianMoveControl extends net.pl3x.purpur.controller.WaterMoveControllerWASD { // Purpur
|
||||
- private static class GuardianMoveControl extends MoveControl {
|
||||
-
|
||||
+ private static class GuardianMoveControl extends net.pl3x.purpur.controller.WaterMoveControllerWASD { // Purpur
|
||||
private final Guardian guardian;
|
||||
|
||||
public GuardianMoveControl(Guardian guardian) {
|
||||
@@ -432,8 +454,17 @@ public class Guardian extends Monster {
|
||||
@@ -358,8 +379,17 @@ public class Guardian extends Monster {
|
||||
this.guardian = guardian;
|
||||
}
|
||||
|
||||
@@ -3297,17 +3299,17 @@ index 012e43aa6e2f6e4970257988620ab76d0f75f494..4aaad673f49988be6470b817d42f3fc4
|
||||
+ @Override
|
||||
+ public void vanillaTick() { // Purpur
|
||||
if (this.operation == MoveControl.Operation.MOVE_TO && !this.guardian.getNavigation().isDone()) {
|
||||
Vec3 vec3 = new Vec3(this.wantedX - this.guardian.getX(), this.wantedY - this.guardian.getY(), this.wantedZ - this.guardian.getZ());
|
||||
double d = vec3.length();
|
||||
@@ -443,7 +474,7 @@ public class Guardian extends Monster {
|
||||
float h = (float)(Mth.atan2(vec3.z, vec3.x) * (double)(180F / (float)Math.PI)) - 90.0F;
|
||||
this.guardian.setYRot(this.rotlerp(this.guardian.getYRot(), h, 90.0F));
|
||||
Vec3 vec3d = new Vec3(this.wantedX - this.guardian.getX(), this.wantedY - this.guardian.getY(), this.wantedZ - this.guardian.getZ());
|
||||
double d0 = vec3d.length();
|
||||
@@ -370,7 +400,7 @@ public class Guardian extends Monster {
|
||||
|
||||
this.guardian.setYRot(this.rotlerp(this.guardian.getYRot(), f, 90.0F));
|
||||
this.guardian.yBodyRot = this.guardian.getYRot();
|
||||
- float i = (float)(this.speedModifier * this.guardian.getAttributeValue(Attributes.MOVEMENT_SPEED));
|
||||
+ float i = (float)(this.getSpeedModifier() * this.guardian.getAttributeValue(Attributes.MOVEMENT_SPEED)); // Purpur
|
||||
float j = Mth.lerp(0.125F, this.guardian.getSpeed(), i);
|
||||
this.guardian.setSpeed(j);
|
||||
double k = Math.sin((double)(this.guardian.tickCount + this.guardian.getId()) * 0.5D) * 0.05D;
|
||||
- float f1 = (float) (this.speedModifier * this.guardian.getAttributeValue(Attributes.MOVEMENT_SPEED));
|
||||
+ float f1 = (float) (this.getSpeedModifier() * this.guardian.getAttributeValue(Attributes.MOVEMENT_SPEED)); // Purpur
|
||||
float f2 = Mth.lerp(0.125F, this.guardian.getSpeed(), f1);
|
||||
|
||||
this.guardian.setSpeed(f2);
|
||||
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 28fb67c0a5992cbd77c5d3c6efa0f0493466d81c..75397a8e1ae8d48bf07f5c0409536acd54851c48 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Husk.java
|
||||
@@ -3710,7 +3712,7 @@ index 2459ae800a5f6b234a4f4bb1cd3738e4e9cac67d..e66cc79dc61721b31ffb743f68f4388c
|
||||
this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
|
||||
}
|
||||
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 abb64887fdcfac824e3d0868c3d473e028354766..1451aeab8e9046f9620214ed74369a8bb1cd6d59 100644
|
||||
index ccf706acafc20e7ba5408d1648b873d6937a030c..059a62da29b7ec11e2ff9baf18dde788bec4923c 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
|
||||
@@ -25,6 +25,18 @@ public class Skeleton extends AbstractSkeleton {
|
||||
@@ -4205,7 +4207,7 @@ index 056c0e66d2f90850906c78a25d759f22c20e4d35..8fd4e26ebe0527fd8a69b15095dd4091
|
||||
this.level.getProfiler().pop();
|
||||
this.updateActivity();
|
||||
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 ddda5d1e85864030db0cfecbf7a5fe134d7013a1..abcdfc77ccef27db11a9e0fe8cb29f84f5e82391 100644
|
||||
index 6408e158745c20ab449c44a28420bc9b28e1efac..6dee348b4e1faec208e5144527ca3df0dab4f96e 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
|
||||
@@ -107,11 +107,25 @@ public class Zombie extends Monster {
|
||||
@@ -4235,7 +4237,7 @@ index ddda5d1e85864030db0cfecbf7a5fe134d7013a1..abcdfc77ccef27db11a9e0fe8cb29f84
|
||||
}
|
||||
|
||||
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 a2fbab27980d7f52033fd542220d534cefcc4747..5744d181b91bcf7f8202c801bce42c96acbdb524 100644
|
||||
index 7a2e3d2ec86536c6caa5a0af0013474143566df8..d487b4cb2da18eac12ec3dc71997cdc1217a85f6 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
|
||||
@@ -74,6 +74,18 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
|
||||
@@ -4319,7 +4321,7 @@ index c510da19883d1aa79b2fc25e2d9c8f5cd8dd7bfa..ce7f7caa535aab1bf849b7e28c98c177
|
||||
this.level.getProfiler().pop();
|
||||
HoglinAi.updateActivity(this);
|
||||
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 adc2feafd0c1a38d1b6b65b8aee59d21725b84fe..34d7bb4daab7ddd857112741d7a0d077d8cec24e 100644
|
||||
index c7ad0e317c0c74e5ad3e08278c5e7b31c894413e..588209ab0a8263951bba9f0b7f46f18b8f7cd9e2 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
|
||||
@@ -97,6 +97,18 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
|
||||
@@ -5718,7 +5720,7 @@ index 0000000000000000000000000000000000000000..8eefb7b7eb33aecf48ac206d3f0139e0
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
index 68cacecde84a592839b738723fb0b73fcb958080..52760eabb45c8d2a3db4056ef219e7ea5cf8d954 100644
|
||||
index 8ce49478441e77cedf5148ecb81d78b32660329e..fb5cd6fe7903f3f96af1abb55832bafb7ca7f4a8 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
@@ -1234,4 +1234,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
||||
@@ -5750,7 +5752,7 @@ index 68cacecde84a592839b738723fb0b73fcb958080..52760eabb45c8d2a3db4056ef219e7ea
|
||||
+ // Purpur end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
index 21471cec1c8403b2b18744210ffe59a729d48105..fc392aaf818db1db15ed68620d6c670fe69534e2 100644
|
||||
index ec00da61e422384276442fa23e496dc078f49d1a..0238bea72b9d4d6b92a03ec59c8697cbe88dbf5a 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
@@ -537,6 +537,15 @@ public class CraftEventFactory {
|
||||
|
||||
Reference in New Issue
Block a user