Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-7267: Fix EntityType#getTranslationKey() and add unit test

Browse Source
This commit is contained in:
Doc 2023-02-20 19:35:39 +11:00 committed by md_5
parent 086d8dc8ac
commit 4a929b5d66
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
View File

@ -377,7 +377,8 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override
public String getTranslationKey(EntityType entityType) {
return EntityTypes.byString(entityType.name()).map(EntityTypes::getDescriptionId).orElseThrow();
Preconditions.checkArgument(entityType.getName() != null, "Invalid name of EntityType %s for translation key", entityType);
return EntityTypes.byString(entityType.getName()).map(EntityTypes::getDescriptionId).orElseThrow();
}
@Override

10
src/test/java/org/bukkit/entity/EntityTypesTest.java
View File

@ -27,4 +27,14 @@ public class EntityTypesTest extends AbstractTestingBase {
Assert.assertTrue("Unmapped bukkit entities " + allBukkit, allBukkit.isEmpty());
}
@Test
public void testTranslationKey() {
for (EntityType entityType : EntityType.values()) {
// Currently EntityType#getTranslationKey has a validation for null name then for test skip this and check correct names.
if (entityType.getName() != null) {
Assert.assertNotNull("Nulllable translation key for " + entityType, entityType.getTranslationKey());
}
}
}
}