From 1e66320771f35d31c3a98e80516e62eda0d555cb Mon Sep 17 00:00:00 2001
From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com>
Date: Sat, 25 Feb 2023 18:39:25 +0100
Subject: [PATCH] fixed NPE

---
 .../viafabricplus/definition/v1_8_x/IdlePacketExecutor.java   | 4 +++-
 .../injection/mixin/fixes/block/MixinSoulSandBlock.java       | 3 ++-
 .../viafabricplus/screen/ProtocolSelectionScreen.java         | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/de/florianmichael/viafabricplus/definition/v1_8_x/IdlePacketExecutor.java b/src/main/java/de/florianmichael/viafabricplus/definition/v1_8_x/IdlePacketExecutor.java
index b7d42404..acf13a2f 100644
--- a/src/main/java/de/florianmichael/viafabricplus/definition/v1_8_x/IdlePacketExecutor.java
+++ b/src/main/java/de/florianmichael/viafabricplus/definition/v1_8_x/IdlePacketExecutor.java
@@ -4,7 +4,9 @@ public class IdlePacketExecutor {
     private static Runnable skipIdlePacketExecute;
 
     public static void skipIdlePacket() {
-        skipIdlePacketExecute.run();
+        if (skipIdlePacketExecute != null) {
+            skipIdlePacketExecute.run();
+        }
     }
 
     public static void registerIdlePacketSkipExecute(final Runnable runnable) {
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinSoulSandBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinSoulSandBlock.java
index 9beac59d..7a9e0be6 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinSoulSandBlock.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinSoulSandBlock.java
@@ -29,8 +29,9 @@ public class MixinSoulSandBlock extends Block {
 
     @Override
     public float getVelocityMultiplier() {
-        if (ViaLoadingBase.getTargetVersion().isOlderThanOrEqualTo(ProtocolVersion.v1_14_4))
+        if (ViaLoadingBase.getTargetVersion().isOlderThanOrEqualTo(ProtocolVersion.v1_14_4)) {
             return 1.0F;
+        }
         return super.getVelocityMultiplier();
     }
 }
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/ProtocolSelectionScreen.java b/src/main/java/de/florianmichael/viafabricplus/screen/ProtocolSelectionScreen.java
index b440f2aa..7078651a 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/ProtocolSelectionScreen.java
+++ b/src/main/java/de/florianmichael/viafabricplus/screen/ProtocolSelectionScreen.java
@@ -34,7 +34,7 @@ public class ProtocolSelectionScreen extends Screen {
     protected void init() {
         super.init();
 
-        this.addDrawableChild(new SlotList(this.client, width, height, 3 + 3 /* start offset */ + (textRenderer.fontHeight + 2) * 3 /* title is 2 */, height + 5, textRenderer.fontHeight + 4));
+        this.addDrawableChild(new SlotList(this.client, width, height, 3 + 3 /* start offset */ + (textRenderer.fontHeight + 2) * 3 /* title is 2 */, height + 5, textRenderer.fontHeight + 2));
         this.addDrawableChild(ButtonWidget.builder(Text.literal("<-"), button -> this.close()).position(0, height - 20).size(20, 20).build());
 
         this.addDrawableChild(ButtonWidget.builder(Text.literal("Values"), button -> ValuesScreen.open(this)).position(0, 0).size(98, 20).build());