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

Properly display blocks using the packet monitoring system.

Browse Source
This commit is contained in:
Kristian S. Stangeland 2014-02-15 12:47:30 +01:00
parent a8378d4e6f
commit 6443de6257
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ProtocolLib/src/main/java/com/comphenix/protocol/CommandPacket.java
View File

@ -349,7 +349,7 @@ class CommandPacket extends CommandBase {
@Override @Override
public boolean print(StringBuilder output, Object value) { public boolean print(StringBuilder output, Object value) {
if (value != null) { if (value != null) {
EquivalentConverter<Object> converter = BukkitConverters.getConvertersForGeneric().get(value.getClass()); EquivalentConverter<Object> converter = findConverter(value.getClass());
if (converter != null) { if (converter != null) {
output.append(converter.getSpecific(value)); output.append(converter.getSpecific(value));
@ -369,6 +369,20 @@ class CommandPacket extends CommandBase {
} }
} }
private EquivalentConverter<Object> findConverter(Class<?> clazz) {
Map<Class<?>, EquivalentConverter<Object>> converters = BukkitConverters.getConvertersForGeneric();
while (clazz != null) {
EquivalentConverter<Object> result = converters.get(clazz);
if (result != null)
return result;
else
clazz = clazz.getSuperclass();
}
return null;
}
@Override @Override
public ListeningWhitelist getSendingWhitelist() { public ListeningWhitelist getSendingWhitelist() {
return serverList; return serverList;

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

@ -827,7 +827,8 @@ public class BukkitConverters {
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(PotionEffect.class, (EquivalentConverter) getPotionEffectConverter()); put(PotionEffect.class, (EquivalentConverter) getPotionEffectConverter()).
put(Material.class, (EquivalentConverter) getBlockConverter());
// Types added in 1.7.2 // Types added in 1.7.2
if (MinecraftReflection.isUsingNetty()) { if (MinecraftReflection.isUsingNetty()) {
@ -865,7 +866,8 @@ public class BukkitConverters {
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.getMobEffectClass(), (EquivalentConverter) getPotionEffectConverter()); put(MinecraftReflection.getMobEffectClass(), (EquivalentConverter) getPotionEffectConverter()).
put(MinecraftReflection.getBlockClass(), (EquivalentConverter) getBlockConverter());
if (hasWorldType) if (hasWorldType)
builder.put(MinecraftReflection.getWorldTypeClass(), (EquivalentConverter) getWorldTypeConverter()); builder.put(MinecraftReflection.getWorldTypeClass(), (EquivalentConverter) getWorldTypeConverter());