Merge branch 'feature/expose-aliases' of https://github.com/sovdeeth/…

…Skript into feature/expose-aliases
SkriptLang · Jun 30, 2024 · 569df84 · 569df84
2 parents 15ca3d6 + d08b20e
commit 569df84
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java b/src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java
@@ -227,7 +227,7 @@ public static Material getTreeSapling(TreeType treeType) {
 	}
 
 
-	private static final boolean HAS_FENCE_TAGS = !Skript.isRunningMinecraft(1,14);
+	private static final boolean HAS_FENCE_TAGS = !Skript.isRunningMinecraft(1, 14);
 
 	/**
 	 * Whether the block is a fence or a wall.

diff --git a/src/main/java/ch/njol/skript/bukkitutil/block/NewBlockCompat.java b/src/main/java/ch/njol/skript/bukkitutil/block/NewBlockCompat.java
@@ -185,7 +185,7 @@ public void setBlock(Block block, Material type, @Nullable BlockValues values, i
 							placed = true;
 						}
 					}
-				} else if (Material.WALL_TORCH == type) {
+				} else if (type == Material.WALL_TORCH) {
 					Directional data;
 					if (ourValues != null)
 						data = (Directional) ourValues.data;

diff --git a/src/main/java/ch/njol/skript/entity/BoatData.java b/src/main/java/ch/njol/skript/entity/BoatData.java
@@ -117,7 +117,7 @@ public boolean isOfItemType(ItemType i){
 		Material type = stack.getType();
 		if (Material.OAK_BOAT == type)
 			ordinal = 0;
-		else if (Material.SPRUCE_BOAT == type)
+		else if (type == Material.SPRUCE_BOAT)
 			ordinal = TreeSpecies.REDWOOD.ordinal();
 		else if (Material.BIRCH_BOAT == type)
 			ordinal = TreeSpecies.BIRCH.ordinal();