From 934897ff1c8e9ef3600862d41d719b737eb679e4 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Tue, 25 Sep 2018 15:37:00 +1000
Subject: [PATCH] Fix inventory mode 2 undo

---
 .../java/com/boydti/fawe/object/changeset/BlockBagChangeSet.java | 1 +
 core/src/main/java/com/sk89q/worldedit/EditSession.java          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/core/src/main/java/com/boydti/fawe/object/changeset/BlockBagChangeSet.java b/core/src/main/java/com/boydti/fawe/object/changeset/BlockBagChangeSet.java
index 6be3a605..c97b5d7e 100644
--- a/core/src/main/java/com/boydti/fawe/object/changeset/BlockBagChangeSet.java
+++ b/core/src/main/java/com/boydti/fawe/object/changeset/BlockBagChangeSet.java
@@ -77,6 +77,7 @@ public class BlockBagChangeSet extends AbstractDelegateChangeSet {
     @Override
     public void add(int x, int y, int z, BaseBlock from, BaseBlock to) {
         check(from.getCombined(), to.getCombined());
+        super.add(x, y, z, from, to);
     }
 
     public void check(int combinedFrom, int combinedTo) {
diff --git a/core/src/main/java/com/sk89q/worldedit/EditSession.java b/core/src/main/java/com/sk89q/worldedit/EditSession.java
index b703f1df..8287a9f6 100644
--- a/core/src/main/java/com/sk89q/worldedit/EditSession.java
+++ b/core/src/main/java/com/sk89q/worldedit/EditSession.java
@@ -1575,6 +1575,7 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
 
     public boolean canBypassAll(Region region, boolean get, boolean set) {
         if (wrapped) return false;
+        if (history != null) return false;
         FaweRegionExtent regionExtent = getRegionExtent();
         if (!(region instanceof CuboidRegion)) return false;
         if (regionExtent != null) {