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

Normalize patches

Browse Source
This commit is contained in:
Prototik
2015-06-01 21:32:10 +07:00
parent 86f83acb7e
commit c427f60e15
16 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patches/net/minecraft/entity/Entity.java.patch
View File

@ -787,7 +787,7 @@
+
+ // Cauldron start
+ public boolean entityAllowedToSpawn() {
+ return true;
+ return true;
+ }
+ // Cauldron end
}

6
patches/net/minecraft/entity/EntityLivingBase.java.patch
View File

@ -532,10 +532,10 @@
+ {
+ float armorDamage = (float) (event.getDamage() + event.getDamage(DamageModifier.BLOCKING) + event.getDamage(DamageModifier.HARD_HAT));
+ if (this instanceof EntityPlayer) {
+ EntityPlayer player = (EntityPlayer) this;
+ armorDamage = ArmorProperties.ApplyArmor(player, player.inventory.armorInventory, damagesource, armorDamage, true);
+ EntityPlayer player = (EntityPlayer) this;
+ armorDamage = ArmorProperties.ApplyArmor(player, player.inventory.armorInventory, damagesource, armorDamage, true);
+ } else {
+ this.damageArmor(armorDamage);
+ this.damageArmor(armorDamage);
+ }
+ }
+

8
patches/net/minecraft/entity/item/EntityItem.java.patch
View File

@ -41,8 +41,8 @@
{
ItemStack stack = this.getDataWatcher().getWatchableObjectItemStack(10);
+ if (stack == null || stack.stackSize == 0) {
+ setDead();
+ return;
+ setDead();
+ return;
+ }
if (stack != null && stack.getItem() != null)
{
@ -306,7 +306,7 @@
+
+ @Override
+ public boolean entityAllowedToSpawn() {
+ ItemStack stack = getDataWatcher().getWatchableObjectItemStack(10);
+ return stack != null && stack.getItem() != null && stack.stackSize > 0;
+ ItemStack stack = getDataWatcher().getWatchableObjectItemStack(10);
+ return stack != null && stack.getItem() != null && stack.stackSize > 0;
+ }
}