From 05fa87a0a3992a05984eab0fdeb66b1645d201da Mon Sep 17 00:00:00 2001
From: C10udburst <18114966+C10udburst@users.noreply.github.com>
Date: Sat, 1 Jan 2022 16:23:43 +0100
Subject: [PATCH] fix #89 and fix #87

---
 .../java/anticope/rejects/commands/SaveSkinCommand.java    | 7 +++++--
 src/main/java/anticope/rejects/modules/PacketFly.java      | 7 +++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/anticope/rejects/commands/SaveSkinCommand.java b/src/main/java/anticope/rejects/commands/SaveSkinCommand.java
index 1bdb069..bb22eac 100644
--- a/src/main/java/anticope/rejects/commands/SaveSkinCommand.java
+++ b/src/main/java/anticope/rejects/commands/SaveSkinCommand.java
@@ -47,8 +47,11 @@ public class SaveSkinCommand extends Command {
             PlayerEntity playerEntity = ctx.getArgument("player", PlayerEntity.class);
             String path = TinyFileDialogs.tinyfd_saveFileDialog("Save image", null, filters, null);
             if (path == null) IO_EXCEPTION.create();
-            if (!path.endsWith(".png")) path += ".png";
-            saveSkin(playerEntity.getUuidAsString(),path);
+            if (path != null) {
+                if (!path.endsWith(".png")) path += ".png";
+                saveSkin(playerEntity.getUuidAsString(),path);
+            }
+            
             return SINGLE_SUCCESS;
         }));
     }
diff --git a/src/main/java/anticope/rejects/modules/PacketFly.java b/src/main/java/anticope/rejects/modules/PacketFly.java
index 8008f30..cf3c765 100644
--- a/src/main/java/anticope/rejects/modules/PacketFly.java
+++ b/src/main/java/anticope/rejects/modules/PacketFly.java
@@ -1,7 +1,6 @@
 package anticope.rejects.modules;
 
 import anticope.rejects.MeteorRejectsAddon;
-import io.netty.util.internal.ConcurrentSet;
 import meteordevelopment.orbit.EventHandler;
 import meteordevelopment.meteorclient.events.entity.player.PlayerMoveEvent;
 import meteordevelopment.meteorclient.events.entity.player.SendMovementPacketsEvent;
@@ -16,10 +15,10 @@ import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 
-import java.util.Set;
+import java.util.HashSet;
 
 public class PacketFly extends Module {
-    private final Set<PlayerMoveC2SPacket> packets = new ConcurrentSet();
+    private final HashSet<PlayerMoveC2SPacket> packets = new HashSet<>();
     private final SettingGroup sgMovement = settings.createGroup("movement");
     private final SettingGroup sgClient = settings.createGroup("client");
     private final SettingGroup sgBypass = settings.createGroup("bypass");
@@ -168,7 +167,7 @@ public class PacketFly extends Module {
     }
 
     private boolean checkHitBoxes() {
-        return !mc.world.getBlockCollisions(mc.player, mc.player.getBoundingBox().expand(-0.0625,-0.0625,-0.0625)).iterator().hasNext();
+        return !mc.world.getBlockCollisions(mc.player, mc.player.getBoundingBox().stretch(-0.0625,-0.0625,-0.0625)).iterator().hasNext();
     }
 
     private boolean resetCounter(int counter) {