forked from xjboss/KCauldronX
122 lines
5.2 KiB
Diff
122 lines
5.2 KiB
Diff
--- ../src-base/minecraft/net/minecraft/item/ItemStack.java
|
|
+++ ../src-work/minecraft/net/minecraft/item/ItemStack.java
|
|
@@ -35,6 +35,20 @@
|
|
import net.minecraft.world.World;
|
|
import net.minecraftforge.event.ForgeEventFactory;
|
|
|
|
+import org.bukkit.craftbukkit.util.CraftMagicNumbers; // CraftBukkit
|
|
+import net.minecraft.entity.player.EntityPlayerMP; // Spigot
|
|
+// Cauldron start
|
|
+import net.minecraft.block.BlockSapling;
|
|
+import net.minecraft.block.BlockMushroom;
|
|
+
|
|
+import org.bukkit.Location;
|
|
+import org.bukkit.TreeType;
|
|
+import org.bukkit.block.BlockState;
|
|
+import org.bukkit.craftbukkit.block.CraftBlockState;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.world.StructureGrowEvent;
|
|
+// Cauldron end
|
|
+
|
|
public final class ItemStack
|
|
{
|
|
public static final DecimalFormat field_111284_a = new DecimalFormat("#.###");
|
|
@@ -43,7 +57,12 @@
|
|
private Item field_151002_e;
|
|
public NBTTagCompound stackTagCompound;
|
|
int itemDamage;
|
|
- private EntityItemFrame itemFrame;
|
|
+ // Cauldron - due to a bug in Gson(https://code.google.com/p/google-gson/issues/detail?id=440), a stackoverflow
|
|
+ // can occur when gson attempts to resolve a field of a class that points to itself.
|
|
+ // As a temporary workaround, we will prevent serialization for this object until the bug is fixed.
|
|
+ // This fixes EE3's serialization of ItemStack.
|
|
+ private transient EntityItemFrame itemFrame;
|
|
+ public static EntityPlayer currentPlayer; // Cauldron - reference to current player calling onItemUse
|
|
private static final String __OBFID = "CL_00000043";
|
|
|
|
private cpw.mods.fml.common.registry.RegistryDelegate<Item> delegate;
|
|
@@ -126,12 +145,14 @@
|
|
public boolean tryPlaceItemIntoWorld(EntityPlayer p_77943_1_, World p_77943_2_, int p_77943_3_, int p_77943_4_, int p_77943_5_, int p_77943_6_, float p_77943_7_, float p_77943_8_, float p_77943_9_)
|
|
{
|
|
if (!p_77943_2_.isRemote) return net.minecraftforge.common.ForgeHooks.onPlaceItemIntoWorld(this, p_77943_1_, p_77943_2_, p_77943_3_, p_77943_4_, p_77943_5_, p_77943_6_, p_77943_7_, p_77943_8_, p_77943_9_);
|
|
- boolean flag = this.getItem().onItemUse(this, p_77943_1_, p_77943_2_, p_77943_3_, p_77943_4_, p_77943_5_, p_77943_6_, p_77943_7_, p_77943_8_, p_77943_9_);
|
|
|
|
+ // Cauldron start - handle all placement events here
|
|
+ boolean flag = this.getItem().onItemUse(this, p_77943_1_, p_77943_2_, p_77943_3_, p_77943_4_, p_77943_5_, p_77943_6_, p_77943_7_, p_77943_8_, p_77943_9_);
|
|
if (flag)
|
|
{
|
|
p_77943_1_.addStat(StatList.objectUseStats[Item.getIdFromItem(this.field_151002_e)], 1);
|
|
}
|
|
+ // Cauldron end
|
|
|
|
return flag;
|
|
}
|
|
@@ -227,8 +248,22 @@
|
|
return getItem().getMaxDamage(this);
|
|
}
|
|
|
|
+ // Spigot start
|
|
+
|
|
+ /**
|
|
+ * Attempts to damage the ItemStack with par1 amount of damage, If the ItemStack has the Unbreaking enchantment
|
|
+ * there is a chance for each point of damage to be negated. Returns true if it takes more damage than
|
|
+ * getMaxDamage(). Returns false otherwise or if the ItemStack can't be damaged or if all points of damage are
|
|
+ * negated.
|
|
+ */
|
|
public boolean attemptDamageItem(int p_96631_1_, Random p_96631_2_)
|
|
{
|
|
+ return isDamaged(p_96631_1_, p_96631_2_, null);
|
|
+ }
|
|
+
|
|
+ public boolean isDamaged(int p_96631_1_, Random p_96631_2_, EntityLivingBase entitylivingbase)
|
|
+ {
|
|
+ // Spigot end
|
|
if (!this.isItemStackDamageable())
|
|
{
|
|
return false;
|
|
@@ -250,6 +285,23 @@
|
|
|
|
p_96631_1_ -= k;
|
|
|
|
+ // Spigot start
|
|
+ if (entitylivingbase instanceof EntityPlayerMP)
|
|
+ {
|
|
+ org.bukkit.craftbukkit.inventory.CraftItemStack item = org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(this);
|
|
+ org.bukkit.event.player.PlayerItemDamageEvent event = new org.bukkit.event.player.PlayerItemDamageEvent(
|
|
+ (org.bukkit.entity.Player) entitylivingbase.getBukkitEntity(), item, p_96631_1_);
|
|
+ org.bukkit.Bukkit.getServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (event.isCancelled())
|
|
+ {
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ p_96631_1_ = event.getDamage();
|
|
+ }
|
|
+ // Spigot end
|
|
+
|
|
if (p_96631_1_ <= 0)
|
|
{
|
|
return false;
|
|
@@ -288,6 +340,12 @@
|
|
this.stackSize = 0;
|
|
}
|
|
|
|
+ // CraftBukkit start - Check for item breaking
|
|
+ if (this.stackSize == 0 && p_77972_2_ instanceof EntityPlayer)
|
|
+ {
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent((EntityPlayer) p_77972_2_, this);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.itemDamage = 0;
|
|
}
|
|
}
|
|
@@ -419,6 +477,7 @@
|
|
|
|
public void setTagCompound(NBTTagCompound p_77982_1_)
|
|
{
|
|
+ // Cauldron - do not alter name of compound. Fixes Ars Magica 2 Spellbooks
|
|
this.stackTagCompound = p_77982_1_;
|
|
}
|
|
|