Skip to content

Commit ccc9e5e

Browse files
committed
Get ready for next release (update Spigot, fix bugs, update version number)
1 parent a52a50e commit ccc9e5e

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>ch.njol</groupId>
44
<artifactId>skript</artifactId>
5-
<version>2.2-dev14c</version>
5+
<version>2.2-dev15</version>
66
<name>Skript</name>
77
<description>A plugin for the Minecraft server API Bukkit that allows to create scripts in natural language.</description>
88
<url>http://njol.ch/projects/skript/</url>
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>org.spigotmc</groupId>
3333
<artifactId>spigot-api</artifactId>
34-
<version>1.9-R0.1-SNAPSHOT</version>
34+
<version>1.9.4-R0.1-SNAPSHOT</version>
3535
</dependency>
3636

3737
<dependency>

src/main/java/ch/njol/skript/lang/SkriptParser.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -727,13 +727,6 @@ public final <T> FunctionReference<T> parseFunction(final @Nullable Class<? exte
727727
params = new Expression[0];
728728
}
729729

730-
final Function<?> function = Functions.getFunction(functionName);
731-
if (function == null && !SkriptConfig.allowFunctionsBeforeDefs.value()) {
732-
Skript.error("The function '" + functionName + "' does not exist");
733-
log.printError();
734-
return null;
735-
}
736-
737730
// final List<Expression<?>> params = new ArrayList<Expression<?>>();
738731
// if (args.length() != 0) {
739732
// final int p = 0;

src/main/java/ch/njol/skript/lang/function/Functions.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ public final static Function<?> loadFunction(final SectionNode node) {
105105
final String definition = node.getKey();
106106
assert definition != null;
107107
final Matcher m = functionPattern.matcher(definition);
108-
//if (!m.matches()) // We have checks when loading the signature
109-
// return error("Invalid function definition. Please check for typos and that the function's name only contains letters and underscores. Refer to the documentation for more information.");
108+
if (!m.matches()) // We have checks when loading the signature
109+
return error("Invalid function definition. Please check for typos and that the function's name only contains letters and underscores. Refer to the documentation for more information.");
110110
final String name = "" + m.group(1);
111111
Signature<?> sign = signatures.get(name);
112112
final List<Parameter<?>> params = sign.parameters;

0 commit comments

Comments
 (0)