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

A couple of small last minute bug fixes.

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Kristian S. Stangeland 2013-12-10 16:27:30 +01:00
Ursprung 9b0d4294cb
Commit ab0ef6d37c
3 geänderte Dateien mit 5 neuen und 6 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
ProtocolLib/src/main/java/com/comphenix/protocol/CommandPacket.java
Datei anzeigen

@ -260,7 +260,7 @@ class CommandPacket extends CommandBase {
if (subCommand == SubCommand.ADD) { if (subCommand == SubCommand.ADD) {
// The add command is dangerous - don't default on the connection side // The add command is dangerous - don't default on the connection side
if (args.length == 1) { if (args.length == 1) {
sender.sendMessage(ChatColor.RED + "Please specify a connectionn side."); sender.sendMessage(ChatColor.RED + "Please specify a connection side.");
return false; return false;
} }

2
ProtocolLib/src/main/java/com/comphenix/protocol/events/PacketContainer.java
Datei anzeigen

@ -595,7 +595,7 @@ public class PacketContainer implements Serializable {
* Retrieve a read/write structure for the NativeGameMode enum in 1.7.2. * Retrieve a read/write structure for the NativeGameMode enum in 1.7.2.
* @return A modifier for NativeGameMode enum fields. * @return A modifier for NativeGameMode enum fields.
*/ */
public StructureModifier<NativeGameMode> getGamemodes() { public StructureModifier<NativeGameMode> getGameModes() {
// Convert to and from the wrapper // Convert to and from the wrapper
return structureModifier.<NativeGameMode>withType( return structureModifier.<NativeGameMode>withType(
EnumWrappers.getGameModeClass(), EnumWrappers.getGameModeConverter()); EnumWrappers.getGameModeClass(), EnumWrappers.getGameModeConverter());

7
ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/EnumWrappers.java
Datei anzeigen

@ -66,9 +66,9 @@ public abstract class EnumWrappers {
/** /**
* Initialize the wrappers, if we haven't already. * Initialize the wrappers, if we haven't already.
*/ */
private static boolean initialize() { private static void initialize() {
if (MinecraftReflection.isUsingNetty()) if (!MinecraftReflection.isUsingNetty())
return false; throw new IllegalArgumentException("Not supported on 1.6.4 and earlier.");
PROTOCOL_CLASS = getEnum(PacketType.Handshake.Client.SET_PROTOCOL.getPacketClass(), 0); PROTOCOL_CLASS = getEnum(PacketType.Handshake.Client.SET_PROTOCOL.getPacketClass(), 0);
CLIENT_COMMAND_CLASS = getEnum(PacketType.Play.Client.CLIENT_COMMAND.getPacketClass(), 0); CLIENT_COMMAND_CLASS = getEnum(PacketType.Play.Client.CLIENT_COMMAND.getPacketClass(), 0);
@ -83,7 +83,6 @@ public abstract class EnumWrappers {
associate(DIFFICULTY_CLASS, Difficulty.class, getDifficultyConverter()); associate(DIFFICULTY_CLASS, Difficulty.class, getDifficultyConverter());
associate(ENTITY_USE_ACTION_CLASS, EntityUseAction.class, getEntityUseActionConverter()); associate(ENTITY_USE_ACTION_CLASS, EntityUseAction.class, getEntityUseActionConverter());
associate(GAMEMODE_CLASS, NativeGameMode.class, getGameModeConverter()); associate(GAMEMODE_CLASS, NativeGameMode.class, getGameModeConverter());
return true;
} }
private static void associate(Class<?> nativeClass, Class<?> wrapperClass, EquivalentConverter<?> converter) { private static void associate(Class<?> nativeClass, Class<?> wrapperClass, EquivalentConverter<?> converter) {