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

Update CraftBukkit to Minecraft 1.5

Browse Source
This commit is contained in:
Travis Watkins
2013-03-13 17:33:27 -05:00
parent ba6e4c38cf
commit 83d29e461c
246 changed files with 8499 additions and 6759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,11 +56,11 @@ public class ContainerMerchant extends Container {
}
public void a(IInventory iinventory) {
this.f.g();
this.f.h();
super.a(iinventory);
}
public void b(int i) {
public void e(int i) {
this.f.c(i);
}
@@ -112,7 +112,7 @@ public class ContainerMerchant extends Container {
public void b(EntityHuman entityhuman) {
super.b(entityhuman);
this.merchant.b_((EntityHuman) null);
this.merchant.a((EntityHuman) null);
super.b(entityhuman);
if (!this.g.isStatic) {
ItemStack itemstack = this.f.splitWithoutUpdate(0);