Update to Minecraft 1.21.2

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-10-23 02:15:00 +11:00
parent 2c4beb962b
commit d3a23f42c3
522 changed files with 8501 additions and 6477 deletions

View File

@@ -1,8 +1,8 @@
--- a/net/minecraft/world/entity/vehicle/EntityMinecartContainer.java
+++ b/net/minecraft/world/entity/vehicle/EntityMinecartContainer.java
@@ -19,6 +19,15 @@
import net.minecraft.world.level.World;
@@ -21,6 +21,15 @@
import net.minecraft.world.level.storage.loot.LootTable;
import net.minecraft.world.phys.Vec3D;
+// CraftBukkit start
+import java.util.List;
@@ -16,7 +16,7 @@
public abstract class EntityMinecartContainer extends EntityMinecartAbstract implements ContainerEntity {
private NonNullList<ItemStack> itemStacks;
@@ -26,14 +35,55 @@
@@ -28,9 +37,50 @@
public ResourceKey<LootTable> lootTable;
public long lootTableSeed;
@@ -67,14 +67,8 @@
+ this.itemStacks = NonNullList.withSize(this.getContainerSize(), ItemStack.EMPTY); // CraftBukkit - SPIGOT-3513
}
protected EntityMinecartContainer(EntityTypes<?> entitytypes, double d0, double d1, double d2, World world) {
super(entitytypes, world, d0, d1, d2);
- this.itemStacks = NonNullList.withSize(36, ItemStack.EMPTY);
+ this.itemStacks = NonNullList.withSize(this.getContainerSize(), ItemStack.EMPTY); // CraftBukkit - SPIGOT-3513
}
@Override
@@ -77,11 +127,18 @@
@@ -74,11 +124,18 @@
@Override
public void remove(Entity.RemovalReason entity_removalreason) {