From 641497297dcc0103503a7ee2d81905aaded94388 Mon Sep 17 00:00:00 2001
From: "Alex \"mcmonkey\" Goodwin" <git_commits@alexgoodwin.dev>
Date: Sat, 8 Jan 2022 04:34:35 -0800
Subject: [PATCH] minor fixes

---
 .../com/denizenscript/denizen/npc/traits/SittingTrait.java     | 3 +++
 .../denizen/scripts/commands/world/PlayEffectCommand.java      | 1 +
 .../v1_18/impl/network/handlers/DenizenNetworkManagerImpl.java | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/SittingTrait.java b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/SittingTrait.java
index 0c0e7e75c3..98eb36a98b 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/SittingTrait.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/SittingTrait.java
@@ -122,6 +122,9 @@ public void sitInternal(Location location) {
     }
 
     public void safetyCleanup(Location loc) {
+        if (loc.getWorld() == null) {
+            return;
+        }
         for (Entity entity : loc.getWorld().getNearbyEntities(loc, 3, 3, 3)) {
             if (entity.getType() == EntityType.ARMOR_STAND && entity.getCustomName() != null && entity.getCustomName().equals(SIT_STAND_NAME) && entity.getPassengers().isEmpty()) {
                 ArmorStand stand = (ArmorStand) entity;
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlayEffectCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlayEffectCommand.java
index 1bc359f303..3ed69e304d 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlayEffectCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlayEffectCommand.java
@@ -127,6 +127,7 @@ else if (!scriptEntry.hasObject("effect") &&
                 else if (arg.matches("barrier") && NMSHandler.getVersion().isAtLeast(NMSVersion.v1_18)) {
                     scriptEntry.addObject("particleeffect", particleHelper.getParticle("block_marker"));
                     scriptEntry.addObject("special_data", new ElementTag("barrier"));
+                    continue;
                 }
                 else if (arg.matches("random")) {
                     // Get another effect if "RANDOM" is used
diff --git a/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/impl/network/handlers/DenizenNetworkManagerImpl.java b/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/impl/network/handlers/DenizenNetworkManagerImpl.java
index ef62723eee..5c1de08224 100644
--- a/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/impl/network/handlers/DenizenNetworkManagerImpl.java
+++ b/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/impl/network/handlers/DenizenNetworkManagerImpl.java
@@ -1061,6 +1061,9 @@ public SocketAddress getRemoteAddress() {
 
     @Override
     public void disconnect(Component ichatbasecomponent) {
+        if (!player.getBukkitEntity().isOnline()) { // Workaround Paper duplicate quit event issue
+            return;
+        }
         oldManager.disconnect(ichatbasecomponent);
     }