Skip to content

Commit 51d056d

Browse files
committed
boat patch 2
1 parent d89d654 commit 51d056d

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed

src/main/java/ch/njol/skript/entity/BoatChestData.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ protected boolean init(@Nullable Class<? extends ChestBoat> clazz, @Nullable Che
7979

8080
@Override
8181
public void set(ChestBoat entity) {
82+
if (IS_RUNNING_1_21_3)
83+
return;
8284
if (matchedPattern == 1) // If the type is 'any boat'.
8385
matchedPattern += new Random().nextInt(Boat.Type.values().length); // It will spawn a random boat type in case is 'any boat'.
8486
if (matchedPattern > 1) // 0 and 1 are excluded

src/main/java/ch/njol/skript/entity/BoatData.java

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,26 @@
11
package ch.njol.skript.entity;
22

3-
import java.util.EnumMap;
4-
import java.util.Locale;
5-
import java.util.Random;
6-
73
import ch.njol.skript.Skript;
8-
import org.bukkit.Material;
9-
import org.bukkit.entity.Boat;
10-
import org.bukkit.entity.boat.*;
114
import ch.njol.skript.aliases.ItemType;
125
import ch.njol.skript.lang.Literal;
136
import ch.njol.skript.lang.SkriptParser.ParseResult;
7+
import org.bukkit.Material;
8+
import org.bukkit.entity.Boat;
9+
import org.bukkit.entity.boat.AcaciaBoat;
10+
import org.bukkit.entity.boat.BambooRaft;
11+
import org.bukkit.entity.boat.BirchBoat;
12+
import org.bukkit.entity.boat.CherryBoat;
13+
import org.bukkit.entity.boat.DarkOakBoat;
14+
import org.bukkit.entity.boat.JungleBoat;
15+
import org.bukkit.entity.boat.MangroveBoat;
16+
import org.bukkit.entity.boat.OakBoat;
17+
import org.bukkit.entity.boat.SpruceBoat;
1418
import org.jetbrains.annotations.Nullable;
1519

20+
import java.util.EnumMap;
21+
import java.util.Locale;
22+
import java.util.Random;
23+
1624
public class BoatData extends EntityData<Boat> {
1725

1826
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
7886

7987
@Override
8088
public void set(Boat entity) {
89+
if (IS_RUNNING_1_21_3)
90+
return;
8191
if (matchedPattern == 1) // If the type is 'any boat'.
8292
matchedPattern += new Random().nextInt(Boat.Type.values().length); // It will spawn a random boat type in case is 'any boat'.
8393
if (matchedPattern > 1) // 0 and 1 are excluded

0 commit comments

Comments
 (0)