Entonez/KCauldronX
1
0
Fork 0
forked from xjboss/KCauldronX
Code Releases Activity

Fix result in decrStackSize

Browse Source
This commit is contained in:
Prototik 2015-06-26 23:47:31 +07:00
parent f6ba538998
commit 102109b7af
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
patches/net/minecraft/crash/CrashReport.java.patch
View File

@ -25,11 +25,11 @@
} }
}); });
+ this.theReportCategory.addCrashSectionCallable("KCauldron Version", new Callable<String>() { + this.theReportCategory.addCrashSectionCallable("KCauldron Version", new Callable<String>() {
+ @Override + @Override
+ public String call() throws Exception { + public String call() throws Exception {
+ return String.format("%s:%s:%s", KCauldron.getGroup(), KCauldron.getChannel(), KCauldron.getCurrentVersion()); + return String.format("%s:%s:%s", KCauldron.getGroup(), KCauldron.getChannel(), KCauldron.getCurrentVersion());
+ } + }
+ }); + });
this.theReportCategory.addCrashSectionCallable("Operating System", new Callable() this.theReportCategory.addCrashSectionCallable("Operating System", new Callable()
{ {
private static final String __OBFID = "CL_00001222"; private static final String __OBFID = "CL_00001222";

28
patches/net/minecraft/entity/player/InventoryPlayer.java.patch
View File

@ -106,29 +106,41 @@
public int getFirstEmptyStack() public int getFirstEmptyStack()
{ {
for (int i = 0; i < this.mainInventory.length; ++i) for (int i = 0; i < this.mainInventory.length; ++i)
@@ -430,17 +505,17 @@ @@ -430,25 +505,24 @@
if (aitemstack[p_70298_1_] != null) if (aitemstack[p_70298_1_] != null)
{ {
- ItemStack itemstack; - ItemStack itemstack;
+ ItemStack itemstack = aitemstack[p_70298_1_]; + ItemStack itemstack = aitemstack[p_70298_1_], result;
- if (aitemstack[p_70298_1_].stackSize <= p_70298_2_) - if (aitemstack[p_70298_1_].stackSize <= p_70298_2_)
+ if (itemstack.stackSize <= p_70298_2_) + if (itemstack.stackSize <= p_70298_2_)
{ {
- itemstack = aitemstack[p_70298_1_]; - itemstack = aitemstack[p_70298_1_];
+ itemstack.stackSize = 0; + result = itemstack.copy();
+ itemstack.stackSize = 0;
aitemstack[p_70298_1_] = null; aitemstack[p_70298_1_] = null;
return itemstack; - return itemstack;
} }
else else
{ {
- itemstack = aitemstack[p_70298_1_].splitStack(p_70298_2_); - itemstack = aitemstack[p_70298_1_].splitStack(p_70298_2_);
+ itemstack = itemstack.splitStack(p_70298_2_); + result = itemstack.splitStack(p_70298_2_);
if (aitemstack[p_70298_1_].stackSize == 0) - if (aitemstack[p_70298_1_].stackSize == 0)
+ if (itemstack.stackSize == 0)
{ {
@@ -658,7 +733,7 @@ - aitemstack[p_70298_1_] = null;
+ itemstack = null;
}
-
- return itemstack;
}
+ return result;
}
else
{
@@ -658,7 +732,7 @@
if (this.mainInventory[i] != null) if (this.mainInventory[i] != null)
{ {
this.player.func_146097_a(this.mainInventory[i], true, false); this.player.func_146097_a(this.mainInventory[i], true, false);
@ -137,7 +149,7 @@
} }
} }
@@ -667,7 +742,7 @@ @@ -667,7 +741,7 @@
if (this.armorInventory[i] != null) if (this.armorInventory[i] != null)
{ {
this.player.func_146097_a(this.armorInventory[i], true, false); this.player.func_146097_a(this.armorInventory[i], true, false);