Anvilcraft/aether-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed various bugs with enchanting. NBT is now kept when repairing, unstackable items will no longer stack from enchanting, and outputs will no longer increase in stack size greater than the amount put in.

Browse source
This commit is contained in:
bconlon 2020-06-19 01:53:12 -07:00
parent a0192fba97
commit b85d2a77b4
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/com/legacy/aether/tileentity/TileEntityEnchanter.java
View file

@ -64,8 +64,13 @@ public class TileEntityEnchanter extends AetherTileEntity {
EnchantmentHelper.setEnchantments(EnchantmentHelper.getEnchantments(this.getStackInSlot(0)), result);
if (this.getStackInSlot(2) != null) {
result.stackSize += (this.getStackInSlot(2).stackSize + 1);
if (this.getStackInSlot(0).hasTagCompound())
{
result.setTagCompound(this.getStackInSlot(0).getTagCompound());
}
if (this.getStackInSlot(2) != null && this.getStackInSlot(2).isStackable()) {
result.stackSize += (this.getStackInSlot(2).stackSize);
this.setInventorySlotContents(2, result);
} else {
@ -105,7 +110,7 @@ public class TileEntityEnchanter extends AetherTileEntity {
AetherEnchantment enchantment = AetherAPI.instance().getEnchantment(itemstack);
if (enchantment != null) {
if (this.getStackInSlot(2) == null || (enchantment.getOutput().getItem() == this.getStackInSlot(2).getItem() && enchantment.getOutput().getItemDamage() == this.getStackInSlot(2).getItemDamage())) {
if (this.getStackInSlot(2) == null || (enchantment.getOutput().getItem() == this.getStackInSlot(2).getItem() && enchantment.getOutput().getItemDamage() == this.getStackInSlot(2).getItemDamage() && this.getStackInSlot(2).isStackable())) {
this.currentEnchantment = enchantment;
this.ticksRequired = this.currentEnchantment.getTimeRequired();
this.addEnchantmentWeight(itemstack);