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

Update CraftBukkit to Minecraft 1.4(.2).

Browse Source
This commit is contained in:
Travis Watkins
2012-10-24 22:53:23 -05:00
committed by EvilSeph
parent b9a72531b6
commit 60819c6693
237 changed files with 10104 additions and 4863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/minecraft/server/ContainerMerchant.java
View File

@@ -60,15 +60,15 @@ public class ContainerMerchant extends Container {
super.a(iinventory);
}
public void c(int i) {
public void b(int i) {
this.f.c(i);
}
public boolean c(EntityHuman entityhuman) {
return this.merchant.l_() == entityhuman;
return this.merchant.m_() == entityhuman;
}
public ItemStack b(int i) {
public ItemStack b(EntityHuman entityhuman, int i) {
ItemStack itemstack = null;
Slot slot = (Slot) this.b.get(i);
@@ -104,7 +104,7 @@ public class ContainerMerchant extends Container {
return null;
}
slot.b(itemstack1);
slot.a(entityhuman, itemstack1);
}
return itemstack;