Parker2991/MCProtocolLib
1
0
Fork 0
mirror of https://github.com/GeyserMC/MCProtocolLib.git synced 2024-12-04 12:51:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Actually fix merge

Browse source
This commit is contained in:
DoctorMacc 2020-12-04 19:21:27 -05:00
parent 5e526ff01a
commit f7647a93ff
No known key found for this signature in database
GPG key ID: 6D6E7E059F186DB4
1 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/com/github/steveice10/mc/protocol/packet/ingame/server/world/ServerMapDataPacket.java
View file

@ -75,7 +75,6 @@ public class ServerMapDataPacket implements Packet {
out.writeByte(this.scale);
out.writeBoolean(this.trackingPosition);
out.writeBoolean(this.locked);
<<<<<<< HEAD
if(this.trackingPosition) {
out.writeVarInt(this.icons.length);
for(int index = 0; index < this.icons.length; index++) {
@ -87,25 +86,10 @@ public class ServerMapDataPacket implements Packet {
out.writeByte(icon.getIconRotation());
if (icon.getDisplayName() != null) {
out.writeBoolean(false);
out.writeString(MessageSerializer.toJsonString(icon.getDisplayName()));
out.writeString(DefaultComponentSerializer.get().serialize(icon.getDisplayName()));
} else {
out.writeBoolean(true);
}
=======
out.writeVarInt(this.icons.length);
for(int index = 0; index < this.icons.length; index++) {
MapIcon icon = this.icons[index];
int type = MagicValues.value(Integer.class, icon.getIconType());
out.writeVarInt(type);
out.writeByte(icon.getCenterX());
out.writeByte(icon.getCenterZ());
out.writeByte(icon.getIconRotation());
if (icon.getDisplayName() != null) {
out.writeBoolean(false);
out.writeString(DefaultComponentSerializer.get().serialize(icon.getDisplayName()));
} else {
out.writeBoolean(true);
>>>>>>> fa0aaccb611429a19e5df66016b3d99a95304888
}
}