diff --git a/api/pom.xml b/api/pom.xml
index 519a8a99..dce9e57c 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -6,7 +6,7 @@
net.md-5
bungeecord-parent
- 1.5-SNAPSHOT
+ 1.4.7-SNAPSHOT
../pom.xml
diff --git a/pom.xml b/pom.xml
index 71af32c1..fc5c3e48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
net.md-5
bungeecord-parent
- 1.5-SNAPSHOT
+ 1.4.7-SNAPSHOT
pom
BungeeCord
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 89f5f812..e624fdcf 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -6,7 +6,7 @@
net.md-5
bungeecord-parent
- 1.5-SNAPSHOT
+ 1.4.7-SNAPSHOT
../pom.xml
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/PacketDefinitions.java b/protocol/src/main/java/net/md_5/bungee/protocol/PacketDefinitions.java
index 48f01260..bbe4243a 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/PacketDefinitions.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/PacketDefinitions.java
@@ -12,7 +12,7 @@ public class PacketDefinitions
public enum OpCode
{
- BOOLEAN, BULK_CHUNK, BYTE, BYTE_INT, DOUBLE, FLOAT, INT, INT_3, INT_BYTE, ITEM, LONG, METADATA, OPTIONAL_MOTION, SHORT, SHORT_BYTE, SHORT_ITEM, STRING, TEAM, USHORT_BYTE
+ BOOLEAN, BULK_CHUNK, BYTE, BYTE_INT, DOUBLE, FLOAT, INT, INT_3, INT_BYTE, ITEM, LONG, METADATA, OPTIONAL_MOTION, SHORT, SHORT_BYTE, SHORT_ITEM, STRING, USHORT_BYTE
}
static
@@ -213,10 +213,6 @@ public class PacketDefinitions
{
STRING, INT, INT, INT, FLOAT, BYTE
};
- opCodes[0x3F] = new OpCode[]
- {
- STRING, FLOAT, FLOAT, FLOAT, FLOAT, FLOAT, FLOAT, FLOAT, INT
- };
opCodes[0x46] = new OpCode[]
{
BYTE, BYTE
@@ -227,7 +223,7 @@ public class PacketDefinitions
};
opCodes[0x64] = new OpCode[]
{
- BYTE, BYTE, STRING, BYTE, BOOLEAN
+ BYTE, BYTE, STRING, BYTE
};
opCodes[0x65] = new OpCode[]
{
@@ -301,22 +297,6 @@ public class PacketDefinitions
{
BYTE
};
- opCodes[0xCE] = new OpCode[]
- {
- STRING, STRING, BYTE
- };
- opCodes[0xCF] = new OpCode[]
- {
- STRING, BYTE, STRING, INT
- };
- opCodes[0xD0] = new OpCode[]
- {
- BYTE, STRING
- };
- opCodes[0xD1] = new OpCode[]
- {
- TEAM
- };
opCodes[0xFA] = new OpCode[]
{
STRING, SHORT_BYTE
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/netty/Instruction.java b/protocol/src/main/java/net/md_5/bungee/protocol/netty/Instruction.java
index f6cd82bc..7340055c 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/netty/Instruction.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/netty/Instruction.java
@@ -23,12 +23,9 @@ abstract class Instruction
static final Instruction SHORT_BYTE = new ShortHeader( BYTE );
static final Instruction SHORT_ITEM = new ShortHeader( ITEM );
static final Instruction STRING = new ShortHeader( new Jump( 2 ) );
- static final Instruction TEAM = new Team();
static final Instruction USHORT_BYTE = new UnsignedShortByte();
// Illegal forward references below this line
static final Instruction BYTE_INT = new ByteHeader( INT );
- // Custom instructions
- static final Instruction STRING_ARRAY = new ShortHeader( STRING );
abstract void read(ByteBuf in) throws IOException;
}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/netty/Team.java b/protocol/src/main/java/net/md_5/bungee/protocol/netty/Team.java
deleted file mode 100644
index 935aed6f..00000000
--- a/protocol/src/main/java/net/md_5/bungee/protocol/netty/Team.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package net.md_5.bungee.protocol.netty;
-
-import io.netty.buffer.ByteBuf;
-import java.io.IOException;
-
-class Team extends Instruction
-{
-
- @Override
- void read(ByteBuf in) throws IOException
- {
- STRING.read( in );
- byte mode = in.readByte();
- if ( mode == 0 || mode == 2 )
- {
- STRING.read( in );
- STRING.read( in );
- STRING.read( in );
- BYTE.read( in );
- }
- if ( mode == 0 || mode == 3 || mode == 4 )
- {
- STRING_ARRAY.read( in );
- }
- }
-}
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 145835cb..8f718f1a 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -6,7 +6,7 @@
net.md-5
bungeecord-parent
- 1.5-SNAPSHOT
+ 1.4.7-SNAPSHOT
../pom.xml
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index e4fe73cf..cdf0ac67 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -53,11 +53,11 @@ public class BungeeCord extends ProxyServer
/**
* Server protocol version.
*/
- public static final byte PROTOCOL_VERSION = 60;
+ public static final byte PROTOCOL_VERSION = 51;
/**
* Server game version.
*/
- public static final String GAME_VERSION = "1.5";
+ public static final String GAME_VERSION = "1.4.6";
/**
* Current operation state.
*/