Update to Minecraft 1.18-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-11-22 09:00:00 +11:00
parent a852b81a69
commit 43702a9e10
700 changed files with 10286 additions and 10098 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/inventory/ContainerGrindstone.java
+++ b/net/minecraft/world/inventory/ContainerGrindstone.java
@@ -20,8 +20,30 @@
@@ -19,8 +19,30 @@
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.phys.Vec3D;
@@ -31,9 +31,9 @@
public static final int MAX_NAME_LENGTH = 35;
public static final int INPUT_SLOT = 0;
public static final int ADDITIONAL_SLOT = 1;
@@ -47,6 +69,13 @@
super.update();
ContainerGrindstone.this.a((IInventory) this);
@@ -46,6 +68,13 @@
super.setChanged();
ContainerGrindstone.this.slotsChanged(this);
}
+
+ // CraftBukkit start
@@ -44,20 +44,20 @@
+ // CraftBukkit end
};
this.access = containeraccess;
this.a(new Slot(this.repairSlots, 0, 49, 19) {
@@ -125,6 +154,7 @@
this.a(new Slot(playerinventory, j, 8 + j * 18, 142));
this.addSlot(new Slot(this.repairSlots, 0, 49, 19) {
@@ -124,6 +153,7 @@
this.addSlot(new Slot(playerinventory, j, 8 + j * 18, 142));
}
+ player = (Player) playerinventory.player.getBukkitEntity(); // CraftBukkit
}
@Override
@@ -252,6 +282,7 @@
@@ -251,6 +281,7 @@
@Override
public boolean canUse(EntityHuman entityhuman) {
public boolean stillValid(EntityHuman entityhuman) {
+ if (!this.checkReachable) return true; // CraftBukkit
return a(this.access, entityhuman, Blocks.GRINDSTONE);
return stillValid(this.access, entityhuman, Blocks.GRINDSTONE);
}