Skip to content

Commit b8f953f

Browse files
committed
Merge remote-tracking branch 'upstream/1.21.8' into 1.21.8
2 parents 60dbfa9 + d1595f5 commit b8f953f

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/main/java/net/wurstclient/WurstTranslator.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,12 @@ private boolean isBuiltInWurstResourcePack(Resource resource)
237237

238238
if(!"fabric".equals(knownPack.namespace()))
239239
return false;
240-
241-
String id = knownPack.id();
242-
return "wurst".equals(id) || "wurst_testmod".equals(id)
243-
|| "nicewurst".equals(id);
240+
241+
// Note: Namespace can be "fabric" or "vanilla" depending on
242+
// Fabric API version (changed in 0.139.3+1.21.11).
243+
return ("fabric".equals(knownPack.namespace())
244+
|| "vanilla".equals(knownPack.namespace()))
245+
&& "wurst".equals(knownPack.id()) || "nicewurst".equals(knownPack.id());
244246
}
245247

246248
}

0 commit comments

Comments
 (0)