From 51d056d8638a1504353b204857fabdf3f7b21db6 Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Fri, 1 Nov 2024 20:07:27 -0400
Subject: [PATCH] boat patch 2

---
 .../ch/njol/skript/entity/BoatChestData.java  |  2 ++
 .../java/ch/njol/skript/entity/BoatData.java  | 24 +++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/main/java/ch/njol/skript/entity/BoatChestData.java b/src/main/java/ch/njol/skript/entity/BoatChestData.java
index 78ab1a4a43f..7bb8d397c60 100644
--- a/src/main/java/ch/njol/skript/entity/BoatChestData.java
+++ b/src/main/java/ch/njol/skript/entity/BoatChestData.java
@@ -79,6 +79,8 @@ protected boolean init(@Nullable Class<? extends ChestBoat> clazz, @Nullable Che
 
 	@Override
 	public void set(ChestBoat entity) {
+		if (IS_RUNNING_1_21_3)
+			return;
 		if (matchedPattern == 1) // If the type is 'any boat'.
 			matchedPattern += new Random().nextInt(Boat.Type.values().length); // It will spawn a random boat type in case is 'any boat'.
 		if (matchedPattern > 1) // 0 and 1 are excluded
diff --git a/src/main/java/ch/njol/skript/entity/BoatData.java b/src/main/java/ch/njol/skript/entity/BoatData.java
index d03628c271b..45fb9f0eaae 100644
--- a/src/main/java/ch/njol/skript/entity/BoatData.java
+++ b/src/main/java/ch/njol/skript/entity/BoatData.java
@@ -1,18 +1,26 @@
 package ch.njol.skript.entity;
 
-import java.util.EnumMap;
-import java.util.Locale;
-import java.util.Random;
-
 import ch.njol.skript.Skript;
-import org.bukkit.Material;
-import org.bukkit.entity.Boat;
-import org.bukkit.entity.boat.*;
 import ch.njol.skript.aliases.ItemType;
 import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
+import org.bukkit.Material;
+import org.bukkit.entity.Boat;
+import org.bukkit.entity.boat.AcaciaBoat;
+import org.bukkit.entity.boat.BambooRaft;
+import org.bukkit.entity.boat.BirchBoat;
+import org.bukkit.entity.boat.CherryBoat;
+import org.bukkit.entity.boat.DarkOakBoat;
+import org.bukkit.entity.boat.JungleBoat;
+import org.bukkit.entity.boat.MangroveBoat;
+import org.bukkit.entity.boat.OakBoat;
+import org.bukkit.entity.boat.SpruceBoat;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.EnumMap;
+import java.util.Locale;
+import java.util.Random;
+
 public class BoatData extends EntityData<Boat> {
 
 	private static final boolean IS_RUNNING_1_21_3 = Skript.isRunningMinecraft(1, 21, 3);
@@ -78,6 +86,8 @@ protected boolean init(@Nullable Class<? extends Boat> clazz, @Nullable Boat ent
 
 	@Override
 	public void set(Boat entity) {
+		if (IS_RUNNING_1_21_3)
+			return;
 		if (matchedPattern == 1) // If the type is 'any boat'.
 			matchedPattern += new Random().nextInt(Boat.Type.values().length); // It will spawn a random boat type in case is 'any boat'.
 		if (matchedPattern > 1) // 0 and 1 are excluded