1.21.6 dev

Co-authored-by: Bjarne Koll <git@lynxplay.dev>
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Co-authored-by: Noah van der Aa <ndvdaa@gmail.com>
Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
This commit is contained in:
Bjarne Koll
2025-05-28 13:23:32 +02:00
committed by Nassim Jahnke
parent 39203a65e0
commit a24f9b204c
788 changed files with 41006 additions and 6324 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/LightningBolt.java
+++ b/net/minecraft/world/entity/LightningBolt.java
@@ -39,6 +_,7 @@
@@ -40,6 +_,7 @@
private ServerPlayer cause;
private final Set<Entity> hitEntities = Sets.newHashSet();
private int blocksSetOnFire;
@@ -8,7 +8,7 @@
public LightningBolt(EntityType<? extends LightningBolt> entityType, Level level) {
super(entityType, level);
@@ -76,7 +_,7 @@
@@ -77,7 +_,7 @@
@Override
public void tick() {
super.tick();
@@ -17,7 +17,7 @@
if (this.level().isClientSide()) {
this.level()
.playLocalSound(
@@ -107,7 +_,7 @@
@@ -108,7 +_,7 @@
}
this.powerLightningRod();
@@ -26,7 +26,7 @@
this.gameEvent(GameEvent.LIGHTNING_STRIKE);
}
}
@@ -130,7 +_,7 @@
@@ -131,7 +_,7 @@
}
}
@@ -35,7 +35,7 @@
} else if (this.life < -this.random.nextInt(10)) {
this.flashes--;
this.life = 1;
@@ -139,10 +_,10 @@
@@ -140,10 +_,10 @@
}
}
@@ -48,7 +48,7 @@
List<Entity> entities = this.level()
.getEntities(
this,
@@ -168,26 +_,34 @@
@@ -169,26 +_,34 @@
}
private void spawnFire(int extraIgnitions) {
@@ -89,7 +89,7 @@
BlockState blockState = level.getBlockState(pos);
BlockPos blockPos;
BlockState blockState1;
@@ -200,22 +_,27 @@
@@ -201,22 +_,27 @@
}
if (blockState1.getBlock() instanceof WeatheringCopper) {
@@ -121,7 +121,7 @@
if (optional.isEmpty()) {
break;
}
@@ -224,11 +_,17 @@
@@ -225,11 +_,17 @@
}
}