mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-13 17:04:24 +00:00
More verbose ammo-stacking when picking up ammo. Should fix projectiles not being pickupable (that is a word now) after they got xp.
This commit is contained in:
1 parent
518e04252c
commit
03ece540e6
1 file changed
+17
-3
@@ -114,9 +114,23 @@ public abstract class AmmoItem extends ToolCore implements IAmmo {
|
||||
|
||||
// create a stack to test against
|
||||
ItemStack testsubject = candidate.copy();
|
||||
// all NBT has to match, but the ammo-count obviously differs. So we set our testsubject to the same
|
||||
// this ensures that it's the one to collect and the one we have matches.
|
||||
testsubject.getTagCompound().getCompoundTag("InfiTool").setInteger("Ammo", getAmmoCount(reference));
|
||||
reference = reference.copy();
|
||||
// all NBT has to match, but the ammo-count obviously differs.
|
||||
// we strip known tags that have no impact
|
||||
|
||||
NBTTagCompound tags = testsubject.getTagCompound().getCompoundTag("InfiTool");
|
||||
tags.removeTag("Ammo");
|
||||
tags.removeTag("ToolEXP");
|
||||
tags.removeTag("ToolLevel");
|
||||
tags.removeTag("HeadEXP");
|
||||
tags.removeTag("Damage");
|
||||
|
||||
tags = reference.getTagCompound().getCompoundTag("InfiTool");
|
||||
tags.removeTag("Ammo");
|
||||
tags.removeTag("ToolEXP");
|
||||
tags.removeTag("ToolLevel");
|
||||
tags.removeTag("HeadEXP");
|
||||
tags.removeTag("Damage");
|
||||
|
||||
return ItemStack.areItemStacksEqual(reference, testsubject);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user