Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Osmotic Enchanter doesn't lose your settings when you add/remove a wand before starting enchantment #1054

Open
wants to merge 6 commits into
base: 1.7-final
Choose a base branch
from
Open

Osmotic Enchanter doesn't lose your settings when you add/remove a wand before starting enchantment #1054

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6eb0013
Osmotic Enchanter doesn't lose your settings when you add/remove a wa…
SarahKirksey Jan 11, 2022
f02c345
Osmotic Enchanter doesn't lose your settings when you add/remove a wa…
SarahKirksey Jan 11, 2022
510fe40
Merge branch '1.7-final-OsmoticEnchanterWandTweak' of https://github.…
SarahKirksey Jan 12, 2022
3453280
Osmotic Enchanter doesn't lose your settings when you add/remove a wa…
SarahKirksey Jan 13, 2022
a9d73f7
Merge branch '1.7-final-OsmoticEnchanterWandTweak' of https://github.…
SarahKirksey Jan 13, 2022
ce381c2
Should fix hotswap exploit for Osmotic Enchanter
SarahKirksey Jan 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/java/thaumic/tinkerer/common/block/tile/TileEnchanter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,6 @@ public boolean consumeAllVisCrafting(ItemStack is, EntityPlayer player, AspectLi
public void markDirty() {
super.markDirty();
if (!worldObj.isRemote && !working) {
enchantments.clear();
levels.clear();
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
}
}
Expand Down Expand Up @@ -390,13 +388,13 @@ public ItemStack decrStackSize(int i, int j) {

if (inventorySlots[i].stackSize <= j) {
stackAt = inventorySlots[i];
inventorySlots[i] = null;
setInventorySlotContents(i, null);
return stackAt;
} else {
stackAt = inventorySlots[i].splitStack(j);

if (inventorySlots[i].stackSize == 0)
inventorySlots[i] = null;
setInventorySlotContents(i, null);

return stackAt;
}
Expand All @@ -413,6 +411,8 @@ public ItemStack getStackInSlotOnClosing(int i) {
@Override
public void setInventorySlotContents(int i, ItemStack itemstack) {
inventorySlots[i] = itemstack;
if(i==0)
clearEnchants();
}

@Override
Expand Down