Fixed weird interactions with certain blocks and added range decrease…

… feature
JackyyTV · Jan 6, 2018 · 0b5fe78 · 0b5fe78
1 parent d869daa
commit 0b5fe78
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/main/java/jackyy/exchangers/handler/ExchangerHandler.java b/src/main/java/jackyy/exchangers/handler/ExchangerHandler.java
@@ -118,13 +118,21 @@ public void switchMode(EntityPlayer player, ItemStack stack) {
         setDefaultTagCompound(stack);
 
         int modeSwitch = stack.getTagCompound().getInteger("mode");
-        modeSwitch++;
+
+        if (player.isSneaking()) {
+            modeSwitch--;
+        } else {
+            modeSwitch++;
+        }
 
         ItemStack heldItem = player.getHeldItemMainhand();
 
         if (heldItem != ItemStack.EMPTY) {
-            if (modeSwitch > getMaxRange())
+            if (modeSwitch > getMaxRange()) {
                 modeSwitch = MODE_1X1;
+            } else if (modeSwitch < MODE_1X1) {
+                modeSwitch = getMaxRange();
+            }
         }
 
         stack.getTagCompound().setInteger("mode", modeSwitch);
@@ -153,7 +161,6 @@ private boolean isWhitelisted(World world, BlockPos pos) {
 
     private boolean isSpecial(Block block) {
         return block instanceof BlockLog
-                || block instanceof BlockLeaves
                 || block instanceof BlockRedstoneOre
                 || block instanceof BlockTrapDoor
                 || block instanceof BlockDoor
@@ -218,6 +225,9 @@ private void placeBlock(ItemStack stack, EntityPlayer player, World world, Block
                     world.playSound(null, coordinate.getX(), coordinate.getY(), coordinate.getZ(),
                             SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.BLOCKS, 0.1F, 1F);
                 } else {
+                    world.restoringBlockSnapshots = true;
+                    event.getBlockSnapshot().restore(true);
+                    world.restoringBlockSnapshots = false;
                     notEnough = true;
                 }
             } else {
@@ -227,10 +237,10 @@ private void placeBlock(ItemStack stack, EntityPlayer player, World world, Block
                 ChatHelper.msgPlayer(player, "error.event_cancelled");
             }
         }
-        world.captureBlockSnapshots = true;
         if (notEnough) {
             ChatHelper.msgPlayer(player, "error.out_of_block");
         }
+        world.captureBlockSnapshots = true;
     }
 
     @SuppressWarnings("deprecation")