Skip to content

Commit 0946735

Browse files
committed
revert networking changes to keep backwards compatability
1 parent bcf8fed commit 0946735

3 files changed

Lines changed: 4 additions & 17 deletions

File tree

src/main/java/co/runed/multicharacter/client/gui/CharacterListGuiScreen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public void onGuiClosed()
101101
MinecraftClientAddon.selectedCharacter = true;
102102
}
103103

104-
PacketDispatcher.sendToServer(new C2SPacketSelectCharacter(characterIndex, characters.get(characterIndex)));
104+
PacketDispatcher.sendToServer(new C2SPacketSelectCharacter(characterIndex));
105105
}
106106
}
107107

src/main/java/co/runed/multicharacter/network/PacketDispatcher.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,14 @@ public static void init()
3232

3333
public static <R extends IMessage, RP extends IMessage> void registerPacket(Class<? extends IMessageHandler<R, RP>> messageHandler, Class<R> requestMessageType, Side side)
3434
{
35-
registerPacket(PACKET_ID + 1, messageHandler, requestMessageType, side);
36-
}
37-
38-
public static <R extends IMessage, RP extends IMessage> void registerPacket(int id, Class<? extends IMessageHandler<R, RP>> messageHandler, Class<R> requestMessageType, Side side)
39-
{
40-
id = id <= PACKET_ID ? PACKET_ID + 1 : id;
41-
PACKET_ID = id;
42-
4335
// IF ON A SERVER AND PACKET IS TO BE RUN ON CLIENT, SET HANDLER TO BLANK LAMBDA TO ALLOW USE OF CLIENT SIDE CODE IN PACKET
4436
if (side == Side.CLIENT && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER)
4537
{
46-
WRAPPER.registerMessage((message, ctx) -> null, requestMessageType, id, side);
38+
WRAPPER.registerMessage((message, ctx) -> null, requestMessageType, PACKET_ID++, side);
4739
return;
4840
}
4941

50-
WRAPPER.registerMessage(messageHandler, requestMessageType, id, side);
42+
WRAPPER.registerMessage(messageHandler, requestMessageType, PACKET_ID++, side);
5143
}
5244

5345
public static void sendTo(IMessage message, EntityPlayerMP player)

src/main/java/co/runed/multicharacter/network/packets/C2SPacketSelectCharacter.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,27 @@
1717
public class C2SPacketSelectCharacter implements IMessage
1818
{
1919
private int index;
20-
private Character character;
2120

2221
public C2SPacketSelectCharacter()
2322
{
2423

2524
}
2625

27-
public C2SPacketSelectCharacter(int index, Character character)
26+
public C2SPacketSelectCharacter(int index)
2827
{
2928
this.index = index;
30-
this.character = character;
3129
}
3230

3331
@Override
3432
public void fromBytes(ByteBuf buf)
3533
{
3634
index = buf.readInt();
37-
character = new Character();
38-
character.deserializeNBT(ByteBufUtils.readTag(buf));
3935
}
4036

4137
@Override
4238
public void toBytes(ByteBuf buf)
4339
{
4440
buf.writeInt(index);
45-
ByteBufUtils.writeTag(buf, character.serializeNBT());
4641
}
4742

4843
public int getIndex()

0 commit comments

Comments
 (0)