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.4.

Browse Source
This commit is contained in:
Travis Watkins
2012-11-06 06:05:28 -06:00
parent a0c3b4f9d1
commit 7f7192f8fd
169 changed files with 3295 additions and 2774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,13 +64,13 @@ public class ContainerMerchant extends Container {
this.f.c(i);
}
public boolean c(EntityHuman entityhuman) {
public boolean a(EntityHuman entityhuman) {
return this.merchant.m_() == entityhuman;
}
public ItemStack b(EntityHuman entityhuman, int i) {
ItemStack itemstack = null;
Slot slot = (Slot) this.b.get(i);
Slot slot = (Slot) this.c.get(i);
if (slot != null && slot.d()) {
ItemStack itemstack1 = slot.getItem();
@@ -110,10 +110,10 @@ public class ContainerMerchant extends Container {
return itemstack;
}
public void a(EntityHuman entityhuman) {
super.a(entityhuman);
this.merchant.a_((EntityHuman) null);
super.a(entityhuman);
public void b(EntityHuman entityhuman) {
super.b(entityhuman);
this.merchant.b_((EntityHuman) null);
super.b(entityhuman);
if (!this.g.isStatic) {
ItemStack itemstack = this.f.splitWithoutUpdate(0);