map fixes

Author: laz1444

src/MiNET/MiNET/Entities/World/MapEntity.cs

@@ -37,6 +37,7 @@ public class MapEntity : Entity
 		private static readonly ILog Log = LogManager.GetLogger(typeof(MapEntity));
 
 		public MapInfo MapInfo { get; set; }
+		public bool initialized { get; set; } = false;
 		public IMapImageProvider ImageProvider { get; set; }
 
 		public MapEntity(Level level, long mapId = EntityManager.EntityIdUndefined) : base(EntityType.None, level)
@@ -56,7 +57,7 @@ public MapEntity(Level level, long mapId = EntityManager.EntityIdUndefined) : ba
 			var mapInfo = new MapInfo
 			{
 				MapId = EntityId,
-				UpdateType = 6,
+				UpdateType = 0,
 				Scale = 0,
 				X = 0,
 				Z = 0,
@@ -107,12 +108,15 @@ public override void OnTick(Entity[] entities)
 			if (data != null)
 			{
 				MapInfo.Data = data;
+
+				MapInfo.UpdateType = initialized ? (byte) 2 : (byte) 8;
+
 				var mapInfo = (MapInfo) MapInfo.Clone();
 
 				var msg = McpeClientboundMapItemData.CreateObject();
 				msg.mapinfo = mapInfo;
 				Level.RelayBroadcast(msg);
-
+				initialized = true;
 				return;
 			}
 

src/MiNET/MiNET/Net/MCPE Protocol.cs

@@ -5897,6 +5897,7 @@ public partial class McpeMapInfoRequest : Packet<McpeMapInfoRequest>
 	{
 
 		public long mapId; // = null;
+		public pixelList pixellist; // = null;
 
 		public McpeMapInfoRequest()
 		{
@@ -5911,6 +5912,7 @@ protected override void EncodePacket()
 			BeforeEncode();
 
 			WriteSignedVarLong(mapId);
+			WriteUnsignedVarInt(0);
 
 			AfterEncode();
 		}
@@ -5925,6 +5927,7 @@ protected override void DecodePacket()
 			BeforeDecode();
 
 			mapId = ReadSignedVarLong();
+			pixellist = ReadPixelList();
 
 			AfterDecode();
 		}
@@ -5937,6 +5940,7 @@ protected override void ResetPacket()
 			base.ResetPacket();
 
 			mapId=default(long);
+			pixellist = default(pixelList);
 		}
 
 	}

src/MiNET/MiNET/Net/Packet.cs

@@ -3182,8 +3182,8 @@ public void Write(MapInfo map)
 
 			if ((map.UpdateType & MapUpdateFlagInitialisation) != 0)
 			{
-				WriteUnsignedVarInt(0);
-				//WriteSignedVarLong(map.MapId);
+				WriteUnsignedVarInt(1);
+				WriteSignedVarLong(map.MapId);
 			}
 
 			if ((map.UpdateType & (MapUpdateFlagInitialisation | MapUpdateFlagDecoration | MapUpdateFlagTexture)) != 0)
@@ -3404,6 +3404,18 @@ public MapInfo ReadMapInfo()
 			return map;
 		}
 
+		public pixelList ReadPixelList()
+		{
+			pixelList mapData = new pixelList();
+
+			var listSize = ReadInt();
+			for (int i = 0; i < listSize; i++)
+			{
+				mapData.mapData.Add(new pixels { pixel = ReadUnsignedVarInt(), index = ReadShort()});
+			}
+			return mapData;
+		}
+
 		public void Write(ScoreEntries list)
 		{
 			if (list == null) list = new ScoreEntries();

src/MiNET/MiNET/Utils/pixelList.cs

@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+
+namespace MiNET.Utils
+{
+	public class pixelList
+	{
+		public List<pixels> mapData = new List<pixels>();
+	}
+	public class pixels
+	{
+		public uint pixel;
+		public short index;
+	}
+}