Only add the WorldType converter if it exists in that Minecraft version
Dieser Commit ist enthalten in:
Ursprung
5c2fc8684e
Commit
7170bfcadc
@ -432,14 +432,18 @@ public class BukkitConverters {
|
|||||||
public static Map<Class<?>, EquivalentConverter<Object>> getSpecificConverters() {
|
public static Map<Class<?>, EquivalentConverter<Object>> getSpecificConverters() {
|
||||||
if (specificConverters == null) {
|
if (specificConverters == null) {
|
||||||
// Generics doesn't work, as usual
|
// Generics doesn't work, as usual
|
||||||
specificConverters = ImmutableMap.<Class<?>, EquivalentConverter<Object>>builder().
|
ImmutableMap.Builder<Class<?>, EquivalentConverter<Object>> builder =
|
||||||
|
ImmutableMap.<Class<?>, EquivalentConverter<Object>>builder().
|
||||||
put(WrappedDataWatcher.class, (EquivalentConverter) getDataWatcherConverter()).
|
put(WrappedDataWatcher.class, (EquivalentConverter) getDataWatcherConverter()).
|
||||||
put(ItemStack.class, (EquivalentConverter) getItemStackConverter()).
|
put(ItemStack.class, (EquivalentConverter) getItemStackConverter()).
|
||||||
put(NbtBase.class, (EquivalentConverter) getNbtConverter()).
|
put(NbtBase.class, (EquivalentConverter) getNbtConverter()).
|
||||||
put(NbtCompound.class, (EquivalentConverter) getNbtConverter()).
|
put(NbtCompound.class, (EquivalentConverter) getNbtConverter()).
|
||||||
put(WrappedWatchableObject.class, (EquivalentConverter) getWatchableObjectConverter()).
|
put(WrappedWatchableObject.class, (EquivalentConverter) getWatchableObjectConverter());
|
||||||
put(WorldType.class, (EquivalentConverter) getWorldTypeConverter()).
|
|
||||||
build();
|
if (hasWorldType) {
|
||||||
|
builder.put(WorldType.class, (EquivalentConverter) getWorldTypeConverter());
|
||||||
|
}
|
||||||
|
specificConverters = builder.build();
|
||||||
}
|
}
|
||||||
return specificConverters;
|
return specificConverters;
|
||||||
}
|
}
|
||||||
@ -452,14 +456,18 @@ public class BukkitConverters {
|
|||||||
public static Map<Class<?>, EquivalentConverter<Object>> getGenericConverters() {
|
public static Map<Class<?>, EquivalentConverter<Object>> getGenericConverters() {
|
||||||
if (genericConverters == null) {
|
if (genericConverters == null) {
|
||||||
// Generics doesn't work, as usual
|
// Generics doesn't work, as usual
|
||||||
genericConverters = ImmutableMap.<Class<?>, EquivalentConverter<Object>>builder().
|
ImmutableMap.Builder<Class<?>, EquivalentConverter<Object>> builder =
|
||||||
|
ImmutableMap.<Class<?>, EquivalentConverter<Object>>builder().
|
||||||
put(MinecraftReflection.getDataWatcherClass(), (EquivalentConverter) getDataWatcherConverter()).
|
put(MinecraftReflection.getDataWatcherClass(), (EquivalentConverter) getDataWatcherConverter()).
|
||||||
put(MinecraftReflection.getItemStackClass(), (EquivalentConverter) getItemStackConverter()).
|
put(MinecraftReflection.getItemStackClass(), (EquivalentConverter) getItemStackConverter()).
|
||||||
put(MinecraftReflection.getNBTBaseClass(), (EquivalentConverter) getNbtConverter()).
|
put(MinecraftReflection.getNBTBaseClass(), (EquivalentConverter) getNbtConverter()).
|
||||||
put(MinecraftReflection.getNBTCompoundClass(), (EquivalentConverter) getNbtConverter()).
|
put(MinecraftReflection.getNBTCompoundClass(), (EquivalentConverter) getNbtConverter()).
|
||||||
put(MinecraftReflection.getWatchableObjectClass(), (EquivalentConverter) getWatchableObjectConverter()).
|
put(MinecraftReflection.getWatchableObjectClass(), (EquivalentConverter) getWatchableObjectConverter());
|
||||||
put(MinecraftReflection.getWorldTypeClass(), (EquivalentConverter) getWorldTypeConverter()).
|
|
||||||
build();
|
if (hasWorldType) {
|
||||||
|
builder.put(MinecraftReflection.getWorldTypeClass(), (EquivalentConverter) getWorldTypeConverter());
|
||||||
|
}
|
||||||
|
genericConverters = builder.build();
|
||||||
}
|
}
|
||||||
return genericConverters;
|
return genericConverters;
|
||||||
}
|
}
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren