Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-22 10:05:12 +01:00
Code Issues Projects Releases Wiki Activity

Fix auto-team not sending in the right order, #699

Browse Source
This commit is contained in:
Myles 2017-06-29 20:04:40 +01:00
parent 634f92b5cd
commit 4d58c717cd
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/PlayerPackets.java
View File

@ -136,15 +136,11 @@ public class PlayerPackets {
if (entityTracker.isAutoTeam() && player.equalsIgnoreCase(myName)) { if (entityTracker.isAutoTeam() && player.equalsIgnoreCase(myName)) {
if (mode == 4) { if (mode == 4) {
// since removing add to auto team // since removing add to auto team
Via.getPlatform().runSync(new Runnable() { entityTracker.sendTeamPacket(true, false);
@Override
public void run() {
entityTracker.sendTeamPacket(true);
}
});
} else { } else {
// since adding remove from auto team // since adding remove from auto team
entityTracker.sendTeamPacket(false); entityTracker.sendTeamPacket(false, true);
} }
} }
} }

2
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/WorldPackets.java
View File

@ -217,7 +217,7 @@ public class WorldPackets {
if (Via.getConfig().isAutoTeam()) { if (Via.getConfig().isAutoTeam()) {
EntityTracker entityTracker = wrapper.user().get(EntityTracker.class); EntityTracker entityTracker = wrapper.user().get(EntityTracker.class);
entityTracker.setAutoTeam(true); entityTracker.setAutoTeam(true);
entityTracker.sendTeamPacket(true); entityTracker.sendTeamPacket(true, true);
} }
} }
}); });

8
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/EntityTracker.java
View File

@ -241,10 +241,10 @@ public class EntityTracker extends StoredObject {
return null; return null;
} }
public void sendTeamPacket(boolean b) { public void sendTeamPacket(boolean add, boolean now) {
PacketWrapper wrapper = new PacketWrapper(0x41, null, getUser()); PacketWrapper wrapper = new PacketWrapper(0x41, null, getUser());
wrapper.write(Type.STRING, "viaversion"); // Use viaversion as name wrapper.write(Type.STRING, "viaversion"); // Use viaversion as name
if (b) { if (add) {
// add // add
if (!teamExists) { if (!teamExists) {
wrapper.write(Type.BYTE, (byte) 0); // make team wrapper.write(Type.BYTE, (byte) 0); // make team
@ -263,9 +263,9 @@ public class EntityTracker extends StoredObject {
} else { } else {
wrapper.write(Type.BYTE, (byte) 1); // remove team wrapper.write(Type.BYTE, (byte) 1); // remove team
} }
teamExists = b; teamExists = add;
try { try {
wrapper.send(Protocol1_9TO1_8.class); wrapper.send(Protocol1_9TO1_8.class, true, now);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }