Update to Minecraft 1.21

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-06-14 01:05:00 +10:00
parent 7c6204e1a9
commit eed041d629
255 changed files with 3585 additions and 3261 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/damagesource/DamageSources.java
+++ b/net/minecraft/world/damagesource/DamageSources.java
@@ -41,9 +41,15 @@
@@ -42,9 +42,15 @@
private final DamageSource stalagmite;
private final DamageSource outsideBorder;
private final DamageSource genericKill;
@@ -14,9 +14,9 @@
+ this.poison = this.source(DamageTypes.MAGIC).poison();
+ // CraftBukkit end
this.inFire = this.source(DamageTypes.IN_FIRE);
this.campfire = this.source(DamageTypes.CAMPFIRE);
this.lightningBolt = this.source(DamageTypes.LIGHTNING_BOLT);
this.onFire = this.source(DamageTypes.ON_FIRE);
@@ -81,6 +87,16 @@
@@ -83,6 +89,16 @@
return new DamageSource(this.damageTypes.getHolderOrThrow(resourcekey), entity, entity1);
}
@@ -33,7 +33,7 @@
public DamageSource inFire() {
return this.inFire;
}
@@ -242,7 +258,13 @@
@@ -248,7 +264,13 @@
}
public DamageSource explosion(@Nullable Entity entity, @Nullable Entity entity1) {
@@ -48,7 +48,7 @@
}
public DamageSource sonicBoom(Entity entity) {
@@ -250,7 +272,13 @@
@@ -256,7 +278,13 @@
}
public DamageSource badRespawnPointExplosion(Vec3D vec3d) {