xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

Update to Forge 10.13.3.1388. Small fixes.

Browse Source
This commit is contained in:
gamerforEA
2015-04-24 15:40:52 +03:00
parent 8bd7ff1755
commit d5cf443039
23 changed files with 237 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
View File

@ -247,11 +247,11 @@ public class CraftInventory implements Inventory {
}
private int firstPartial(ItemStack item) {
ItemStack[] inventory = getContents();
ItemStack filteredItem = CraftItemStack.asCraftCopy(item);
if (item == null) {
return -1;
}
ItemStack[] inventory = getContents();
ItemStack filteredItem = CraftItemStack.asCraftCopy(item);
for (int i = 0; i < inventory.length; i++) {
ItemStack cItem = inventory[i];
if (cItem != null && cItem.getAmount() < cItem.getMaxStackSize() && cItem.isSimilar(filteredItem)) {

2
src/main/java/org/spigotmc/CustomTimingsHandler.java
View File

@ -103,7 +103,7 @@ public class CustomTimingsHandler
{
if ( timings.curTickTotal > 50000000 )
{
timings.violations += Math.ceil( timings.curTickTotal / 50000000 );
timings.violations += Math.ceil( (double) timings.curTickTotal / 50000000 );
}
timings.curTickTotal = 0;
timings.timingDepth = 0; // incase reset messes this up