Skip to content

Commit 6986a5b

Browse files
committed
added branch back to custom builds
1 parent 7f45088 commit 6986a5b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/ForgeExtension.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ private void checkAndSetVersion(String str)
128128
matcher = STANDARD.matcher(str);
129129
if (matcher.matches())
130130
{
131-
String branch = Strings.emptyToNull(matcher.group(4));
131+
String branch = matcher.group(4);
132132
String mcversion = matcher.group(1);
133133

134134
String forgeVersion = matcher.group(2);
@@ -138,7 +138,7 @@ private void checkAndSetVersion(String str)
138138
{
139139
LOGGER.lifecycle("Assuming custom forge version!");
140140
version = mcversion;
141-
this.forgeVersion = forgeVersion;
141+
this.forgeVersion = forgeVersion + branch;
142142
return;
143143
}
144144

@@ -150,7 +150,7 @@ private void checkAndSetVersion(String str)
150150
}
151151

152152
boolean branchMatches = false;
153-
if (branch == null)
153+
if (Strings.isNullOrEmpty(branch))
154154
branchMatches = Strings.isNullOrEmpty(build.branch);
155155
else
156156
branchMatches = branch.substring(1).equals(build.branch);

0 commit comments

Comments
 (0)