Update CraftBukkit to 1.6.1
This commit is contained in:
committed by
Wesley Wolfe
parent
f887b76a25
commit
6c09066e22
@@ -1,5 +1,7 @@
|
||||
package org.bukkit.craftbukkit.inventory;
|
||||
|
||||
import net.minecraft.server.EntityInsentient;
|
||||
|
||||
import org.bukkit.craftbukkit.entity.CraftLivingEntity;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.inventory.EntityEquipment;
|
||||
@@ -133,10 +135,10 @@ public class CraftEntityEquipment implements EntityEquipment {
|
||||
}
|
||||
|
||||
private void setDropChance(int slot, float chance) {
|
||||
entity.getHandle().dropChances[slot] = chance - 0.1F;
|
||||
((EntityInsentient) entity.getHandle()).dropChances[slot] = chance - 0.1F;
|
||||
}
|
||||
|
||||
private float getDropChance(int slot) {
|
||||
return entity.getHandle().dropChances[slot] + 0.1F;
|
||||
return ((EntityInsentient) entity.getHandle()).dropChances[slot] + 0.1F;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
package org.bukkit.craftbukkit.inventory;
|
||||
|
||||
import net.minecraft.server.IInventory;
|
||||
|
||||
public class CraftInventoryHorse extends CraftInventory {
|
||||
private final IInventory resultInventory = null;
|
||||
|
||||
public CraftInventoryHorse(IInventory inventory) {
|
||||
super(inventory);
|
||||
}
|
||||
|
||||
public IInventory getResultInventory() {
|
||||
return resultInventory;
|
||||
}
|
||||
|
||||
public IInventory getIngredientsInventory() {
|
||||
return inventory;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSize() {
|
||||
//return getResultInventory().getSize() + getIngredientsInventory().getSize();
|
||||
return getIngredientsInventory().getSize();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user