twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-07 23:52:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.14.2

Browse Source
This commit is contained in:
md_5
2019-05-28 06:30:00 +10:00
parent fcb9f90bf3
commit cb3d14c5a7
57 changed files with 385 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
nms-patches/ContainerWorkbench.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/ContainerWorkbench.java
+++ b/net/minecraft/server/ContainerWorkbench.java
@@ -1,13 +1,21 @@
@@ -1,6 +1,10 @@
package net.minecraft.server;
import java.util.Optional;
@@ -11,10 +11,9 @@
public class ContainerWorkbench extends ContainerRecipeBook<InventoryCrafting> {
private final InventoryCrafting craftInventory;
@@ -8,6 +12,10 @@
private final InventoryCraftResult resultInventory;
- private final ContainerAccess e;
+ public final ContainerAccess e;
public final ContainerAccess containerAccess;
private final EntityHuman f;
+ // CraftBukkit start
+ private CraftInventoryView bukkitEntity = null;
@@ -34,7 +33,7 @@
+ this.craftInventory.resultInventory = this.resultInventory;
+ this.player = playerinventory;
+ // CraftBukkit end
this.e = containeraccess;
this.containerAccess = containeraccess;
this.f = playerinventory.player;
this.a((Slot) (new SlotResult(playerinventory.player, this.craftInventory, this.resultInventory, 0, 124, 35)));
@@ -42,7 +54,7 @@
@@ -57,7 +56,7 @@
@@ -64,7 +77,7 @@
@Override
public void a(IInventory iinventory) {
this.e.a((world, blockposition) -> {
this.containerAccess.a((world, blockposition) -> {
- a(this.windowId, world, this.f, this.craftInventory, this.resultInventory);
+ a(this.windowId, world, this.f, this.craftInventory, this.resultInventory, this); // CraftBukkit
});
@@ -68,7 +67,7 @@
@Override
public boolean canUse(EntityHuman entityhuman) {
+ if (!this.checkReachable) return true; // CraftBukkit
return a(this.e, entityhuman, Blocks.CRAFTING_TABLE);
return a(this.containerAccess, entityhuman, Blocks.CRAFTING_TABLE);
}
@@ -166,4 +180,17 @@