9
0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-22 08:19:31 +00:00

Updated Upstream (Paper)

This commit is contained in:
Dreeam
2024-05-28 18:02:07 +08:00
parent 876e3b3853
commit 4ddda03524
29 changed files with 121 additions and 130 deletions

View File

@@ -265,7 +265,7 @@ index f402dbbfe3a443e6bc51f88b85abe937852b52f0..2c6388d892d0b58ba1800b795418fc95
float DEFAULT_DISTANCE_BUFFER = 4.0F;
diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
index 2704389bc3ec6dbbf1b568a4380972f8c0d62d15..d6c2455f41024dd839986cce70fd27d804c3da58 100644
index 9549eee0d92f322bd5232abd7e695213660c2e22..297e13ccc47cf1d4fa92f41bb84f04df89322001 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
@@ -30,7 +30,10 @@ import org.bukkit.inventory.InventoryHolder;
@@ -279,7 +279,7 @@ index 2704389bc3ec6dbbf1b568a4380972f8c0d62d15..d6c2455f41024dd839986cce70fd27d8
@Nullable
public ResourceKey<LootTable> lootTable;
public long lootTableSeed;
@@ -92,12 +95,18 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
@@ -86,12 +89,18 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
protected AbstractMinecartContainer(EntityType<?> type, Level world) {
super(type, world);
@@ -300,10 +300,10 @@ index 2704389bc3ec6dbbf1b568a4380972f8c0d62d15..d6c2455f41024dd839986cce70fd27d8
}
@Override
@@ -166,6 +175,10 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
@@ -158,6 +167,10 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
@Override
protected void readAdditionalSaveData(CompoundTag nbt) {
super.readAdditionalSaveData(nbt);
this.lootableData.loadNbt(nbt); // Paper
+ // Gale start - Airplane - improve container checking with a bitset
+ this.itemStacksOptimized = new gg.airplane.structs.ItemListWithBitset(this.getContainerSize());
+ this.itemStacks = this.itemStacksOptimized.nonNullList;