SteamWar/ProtocolLib
Archiviert
13
0
Fork 0
Code Issues Pull-Requests Releases Wiki Aktivität

Only add the WorldType converter if it exists in that Minecraft version

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Kristian S. Stangeland 2013-07-26 18:42:06 +02:00
Ursprung 5c2fc8684e
Commit 7170bfcadc
1 geänderte Dateien mit 16 neuen und 8 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

24
ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/BukkitConverters.java
Datei anzeigen

@ -432,14 +432,18 @@ public class BukkitConverters {
public static Map<Class<?>, EquivalentConverter<Object>> getSpecificConverters() {
if (specificConverters == null) {
// 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(ItemStack.class, (EquivalentConverter) getItemStackConverter()).
put(NbtBase.class, (EquivalentConverter) getNbtConverter()).
put(NbtCompound.class, (EquivalentConverter) getNbtConverter()).
put(WrappedWatchableObject.class, (EquivalentConverter) getWatchableObjectConverter()).
put(WorldType.class, (EquivalentConverter) getWorldTypeConverter()).
build();
put(WrappedWatchableObject.class, (EquivalentConverter) getWatchableObjectConverter());
if (hasWorldType) {
builder.put(WorldType.class, (EquivalentConverter) getWorldTypeConverter());
}
specificConverters = builder.build();
}
return specificConverters;
}
@ -452,14 +456,18 @@ public class BukkitConverters {
public static Map<Class<?>, EquivalentConverter<Object>> getGenericConverters() {
if (genericConverters == null) {
// 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.getItemStackClass(), (EquivalentConverter) getItemStackConverter()).
put(MinecraftReflection.getNBTBaseClass(), (EquivalentConverter) getNbtConverter()).
put(MinecraftReflection.getNBTCompoundClass(), (EquivalentConverter) getNbtConverter()).
put(MinecraftReflection.getWatchableObjectClass(), (EquivalentConverter) getWatchableObjectConverter()).
put(MinecraftReflection.getWorldTypeClass(), (EquivalentConverter) getWorldTypeConverter()).
build();
put(MinecraftReflection.getWatchableObjectClass(), (EquivalentConverter) getWatchableObjectConverter());
if (hasWorldType) {
builder.put(MinecraftReflection.getWorldTypeClass(), (EquivalentConverter) getWorldTypeConverter());
}
genericConverters = builder.build();
}
return genericConverters;
}