Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-11-23 19:16:14 +01:00
Code Issues Projects Releases Wiki Activity

Fix exception for null sounds

Browse Source 
Fixes #2276
This commit is contained in:
Dan Mulloy 2023-03-30 17:07:34 -05:00
parent 4b78bf6a34
commit fb2075b774
No known key found for this signature in database
GPG Key ID: E3B02DE32FB04AC1
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/comphenix/protocol/utility/MinecraftVersion.java
View File

@ -58,6 +58,10 @@ public final class MinecraftVersion implements Comparable<MinecraftVersion>, Ser
* Version 1.17 - caves and cliffs part 1 * Version 1.17 - caves and cliffs part 1
*/ */
public static final MinecraftVersion CAVES_CLIFFS_1 = new MinecraftVersion("1.17"); public static final MinecraftVersion CAVES_CLIFFS_1 = new MinecraftVersion("1.17");
/**
* Version 1.16.4
*/
public static final MinecraftVersion NETHER_UPDATE_4 = new MinecraftVersion("1.16.4");
/** /**
* Version 1.16.2 - breaking change to the nether update * Version 1.16.2 - breaking change to the nether update
*/ */

37
src/main/java/com/comphenix/protocol/wrappers/BukkitConverters.java
View File

@ -1083,19 +1083,19 @@ public class BukkitConverters {
}); });
} }
private static MethodAccessor getSound = null; static MethodAccessor getSound = null;
private static MethodAccessor getSoundEffect = null; static MethodAccessor getSoundEffect = null;
private static FieldAccessor soundKey = null; static FieldAccessor soundKey = null;
private static MethodAccessor getSoundEffectByKey = null; static MethodAccessor getSoundEffectByKey = null;
private static MethodAccessor getSoundEffectBySound = null; static MethodAccessor getSoundEffectBySound = null;
private static MethodAccessor getSoundByEffect = null; static MethodAccessor getSoundByEffect = null;
private static Map<String, Sound> soundIndex = null; static Map<String, Sound> soundIndex = null;
public static EquivalentConverter<Sound> getSoundConverter() { public static EquivalentConverter<Sound> getSoundConverter() {
// Try to create sound converter for new versions greater 1.16.4 // Try to create sound converter for new versions greater 1.16.4
try { if (MinecraftVersion.NETHER_UPDATE_4.atOrAbove()) {
if (getSoundEffectByKey == null || getSoundEffectBySound == null || getSoundByEffect == null) { if (getSoundEffectByKey == null || getSoundEffectBySound == null || getSoundByEffect == null) {
Class<?> craftSound = MinecraftReflection.getCraftSoundClass(); Class<?> craftSound = MinecraftReflection.getCraftSoundClass();
FuzzyReflection fuzzy = FuzzyReflection.fromClass(craftSound, true); FuzzyReflection fuzzy = FuzzyReflection.fromClass(craftSound, true);
@ -1103,19 +1103,19 @@ public class BukkitConverters {
getSoundEffectByKey = Accessors.getMethodAccessor(fuzzy.getMethodByReturnTypeAndParameters( getSoundEffectByKey = Accessors.getMethodAccessor(fuzzy.getMethodByReturnTypeAndParameters(
"getSoundEffect", "getSoundEffect",
MinecraftReflection.getSoundEffectClass(), MinecraftReflection.getSoundEffectClass(),
new Class<?>[]{String.class} String.class
)); ));
getSoundEffectBySound = Accessors.getMethodAccessor(fuzzy.getMethodByReturnTypeAndParameters( getSoundEffectBySound = Accessors.getMethodAccessor(fuzzy.getMethodByReturnTypeAndParameters(
"getSoundEffect", "getSoundEffect",
MinecraftReflection.getSoundEffectClass(), MinecraftReflection.getSoundEffectClass(),
new Class<?>[]{Sound.class} Sound.class
)); ));
getSoundByEffect = Accessors.getMethodAccessor(fuzzy.getMethodByReturnTypeAndParameters( getSoundByEffect = Accessors.getMethodAccessor(fuzzy.getMethodByReturnTypeAndParameters(
"getBukkit", "getBukkit",
Sound.class, Sound.class,
new Class<?>[]{MinecraftReflection.getSoundEffectClass()} MinecraftReflection.getSoundEffectClass()
)); ));
} }
@ -1133,10 +1133,17 @@ public class BukkitConverters {
@Override @Override
public Sound getSpecific(Object generic) { public Sound getSpecific(Object generic) {
return (Sound) getSoundByEffect.invoke(null, generic); try {
return (Sound) getSoundByEffect.invoke(null, generic);
} catch (IllegalStateException ex) {
if (ex.getCause() instanceof NullPointerException) {
// "null" sounds cause NPEs inside getSoundByEffect
return null;
}
throw ex;
}
} }
}); });
} catch (Exception e) {
} }
// Fall back to sound converter from legacy versions before 1.16.4 // Fall back to sound converter from legacy versions before 1.16.4
@ -1144,9 +1151,9 @@ public class BukkitConverters {
Class<?> craftSound = MinecraftReflection.getCraftSoundClass(); Class<?> craftSound = MinecraftReflection.getCraftSoundClass();
FuzzyReflection fuzzy = FuzzyReflection.fromClass(craftSound, true); FuzzyReflection fuzzy = FuzzyReflection.fromClass(craftSound, true);
getSound = Accessors.getMethodAccessor( getSound = Accessors.getMethodAccessor(
fuzzy.getMethodByReturnTypeAndParameters("getSound", String.class, new Class<?>[]{Sound.class})); fuzzy.getMethodByReturnTypeAndParameters("getSound", String.class, Sound.class));
getSoundEffect = Accessors.getMethodAccessor(fuzzy.getMethodByReturnTypeAndParameters("getSoundEffect", getSoundEffect = Accessors.getMethodAccessor(fuzzy.getMethodByReturnTypeAndParameters("getSoundEffect",
MinecraftReflection.getSoundEffectClass(), new Class<?>[]{String.class})); MinecraftReflection.getSoundEffectClass(), String.class));
} }
return ignoreNull(new EquivalentConverter<Sound>() { return ignoreNull(new EquivalentConverter<Sound>() {

2
src/test/java/com/comphenix/protocol/events/PacketContainerTest.java
View File

@ -570,6 +570,8 @@ public class PacketContainerTest {
@Test @Test
public void testSoundEffects() { public void testSoundEffects() {
PacketContainer container = new PacketContainer(PacketType.Play.Server.NAMED_SOUND_EFFECT); PacketContainer container = new PacketContainer(PacketType.Play.Server.NAMED_SOUND_EFFECT);
container.getSoundEffects().optionRead(0);
container.getSoundEffects().write(0, Sound.ENTITY_CAT_HISS); container.getSoundEffects().write(0, Sound.ENTITY_CAT_HISS);
assertEquals(container.getSoundEffects().read(0), Sound.ENTITY_CAT_HISS); assertEquals(container.getSoundEffects().read(0), Sound.ENTITY_CAT_HISS);