Merge branch 'master' into release

Author: laz1444

.github/workflows/dotnet.yml

@@ -38,5 +38,5 @@ jobs:
         file: src/MiNET/MiNET.Console/minet.zip
         asset_name: MiNET.zip
         tag: ${{ github.ref }}
-        release_name: MiNET-CobwebSMP 1.13.0.14 (1.21.20)
+        release_name: MiNET-CobwebSMP 1.13.0.16 (1.21.20)
         body: ${{ github.event.head_commit.message }}

src/MiNET/MiNET.Console/minet.zip

@@ -72,7 +72,7 @@ GameRule.NaturalRegeneration=true
 GameRule.TntExplodes=true
 
 #Should block drop item after breaking? true - yes, false - no.
-DoTiledrops=true
+GameRule.DoTiledrops=true
 
 #Should mobs drop loot after killing?
 DoMobloot=true

src/MiNET/MiNET.Console/server.conf

@@ -30,7 +30,6 @@
 using MiNET.Blocks;
 using MiNET.Net;
 using MiNET.Particles;
-using MiNET.Utils;
 using MiNET.Utils.Metadata;
 using MiNET.Utils.Vectors;
 using MiNET.Worlds;
@@ -117,7 +116,7 @@ public override void OnTick(Entity[] entities)
 
 			bool collided = false;
 			Block collidedWithBlock = null;
-			if (entityCollided != null)
+			if (entityCollided != null && Damage >= 0)
 			{
 				double speed = Math.Sqrt(Velocity.X * Velocity.X + Velocity.Y * Velocity.Y + Velocity.Z * Velocity.Z);
 				double damage = Math.Ceiling(speed * Damage);
@@ -146,10 +145,14 @@ public override void OnTick(Entity[] entities)
 
 				entityCollided.HealthManager.TakeHit(this, (int) damage, DamageCause.Projectile);
 				entityCollided.HealthManager.LastDamageSource = Shooter;
-
 				OnHitEntity(entityCollided);
 				DespawnEntity();
 				return;
+			}else if (entityCollided != null && Damage == -1)
+			{
+				entityCollided.HealthManager.LastDamageSource = Shooter;
+				OnHitEntity(entityCollided);
+				DespawnEntity();
 			}
 			else
 			{
@@ -221,12 +224,15 @@ protected virtual void OnHitEntity(Entity entityCollided)
 
 		private Entity CheckEntityCollide(Vector3 position, Vector3 direction)
 		{
-			Ray2 ray = new Ray2 {x = position, d = Vector3.Normalize(direction)};
+			float Distance = 2.0f;
+
+			Vector3 offsetPosition = position + Vector3.Normalize(direction) * Distance;
+
+			Ray2 ray = new Ray2 { x = offsetPosition, d = Vector3.Normalize(direction) };
 
 			var entities = Level.Entities.Values.Concat(Level.GetSpawnedPlayers()).OrderBy(entity => Vector3.Distance(position, entity.KnownPosition.ToVector3()));
 			foreach (Entity entity in entities)
 			{
-				if (entity == Shooter) continue;
 				if (entity == this) continue;
 				if (entity is Projectile) continue; // This should actually be handled for some projectiles
 				if (entity is Player player && player.GameMode == GameMode.Spectator) continue;

src/MiNET/MiNET/Entities/Projectiles/Projectile.cs

@@ -47,14 +47,14 @@ public ItemStackInventoryManager(Player player)
 		public virtual List<StackResponseContainerInfo> HandleItemStackActions(int requestId, ItemStackActionList actions)
 		{
 			var stackResponses = new List<StackResponseContainerInfo>();
-			uint recipeNetworkId = 0;
+			byte TimesCrafted = 1;
 			foreach (ItemStackAction stackAction in actions)
 			{
 				switch (stackAction)
 				{
 					case CraftAction craftAction:
 					{
-						recipeNetworkId = ProcessCraftAction(craftAction);
+						TimesCrafted = ProcessCraftAction(craftAction);
 						break;
 					}
 					case CraftAutoAction CraftAuto:
@@ -80,7 +80,7 @@ public virtual List<StackResponseContainerInfo> HandleItemStackActions(int reque
 					}
 					case CraftResultDeprecatedAction craftResultDeprecatedAction:
 					{
-						ProcessCraftResultDeprecatedAction(craftResultDeprecatedAction);
+						ProcessCraftResultDeprecatedAction(craftResultDeprecatedAction, TimesCrafted);
 						break;
 					}
 					case TakeAction takeAction:
@@ -405,26 +405,37 @@ protected virtual void ProcessTakeAction(TakeAction action, List<StackResponseCo
 		{
 			byte count = action.Count;
 			Item sourceItem;
+			Item destinationItem;
 			Item destItem;
 			StackRequestSlotInfo source = action.Source;
 			StackRequestSlotInfo destination = action.Destination;
 
 			sourceItem = GetContainerItem(source.ContainerId, source.Slot);
-			Log.Debug($"Take {sourceItem}");
+			destinationItem = GetContainerItem(destination.ContainerId, destination.Slot);
 
-			if (sourceItem.Count == count || sourceItem.Count - count <= 0)
+
+			if (source.ContainerId == 60 && sourceItem.Id == destinationItem.Id)
 			{
-				destItem = sourceItem;
+				destItem = (Item) destinationItem.Clone();
+				destItem.Count += count;
+				destItem.UniqueId = Environment.TickCount;
+			}
+			else if (source.ContainerId != 60 && sourceItem.Count == count)
+			{
+				destItem = (Item) sourceItem.Clone();
+				destItem.Count = (byte)(destinationItem.Count + count);
+				destItem.UniqueId = Environment.TickCount;
 				sourceItem = new ItemAir();
 				sourceItem.UniqueId = 0;
 				SetContainerItem(source.ContainerId, source.Slot, sourceItem);
 			}
 			else
 			{
 				destItem = (Item) sourceItem.Clone();
-				sourceItem.Count -= count;
 				destItem.Count = count;
 				destItem.UniqueId = Environment.TickCount;
+				sourceItem.Count -= count;
+				SetContainerItem(source.ContainerId, source.Slot, sourceItem);
 			}
 
 			SetContainerItem(destination.ContainerId, destination.Slot, destItem);
@@ -469,15 +480,12 @@ protected virtual void ProcessTakeAction(TakeAction action, List<StackResponseCo
 			});
 		}
 
-		protected virtual void ProcessCraftResultDeprecatedAction(CraftResultDeprecatedAction action)
+		protected virtual void ProcessCraftResultDeprecatedAction(CraftResultDeprecatedAction action, byte TimesCrafted)
 		{
-			//BUG: Won't work proper with anvil anymore.
 			if (GetContainerItem(59, 50).UniqueId > 0) return;
-
-			//TODO: We only use this for anvils right now. Until we fixed the anvil merge ourselves.
 			Item craftingResult = action.ResultItems.FirstOrDefault();
 			if (craftingResult == null) return;
-			
+			craftingResult.Count = (byte)(craftingResult.Count * TimesCrafted);
 			craftingResult.UniqueId = Environment.TickCount;
 			SetContainerItem(59, 50, craftingResult);
 		}
@@ -486,14 +494,20 @@ protected virtual void ProcessCraftNotImplementedDeprecatedAction(CraftNotImplem
 		{
 		}
 
-		protected virtual uint ProcessCraftAction(CraftAction action)
+		protected virtual byte ProcessCraftAction(CraftAction action)
 		{
-			return action.RecipeNetworkId;
+			return action.TimesCrafted;
+			/*RecipeManager.resultMap.TryGetValue((int) action.RecipeNetworkId, out Item item);
+			Item craftedItem = ItemFactory.GetItem(item.Id, item.Metadata, item.Count);
+			craftedItem.Count = (byte) ((item.Count + GetContainerItem(59, 0).Count) * action.TimesCrafted);
+			Log.Error(GetContainerItem(59, 0).Id);
+			Log.Error(GetContainerItem(59, 0).Count);
+			SetContainerItem(59, 0, craftedItem);*/
 		}
 		protected virtual void ProcessCraftAuto(CraftAutoAction action)
 		{
 			RecipeManager.resultMap.TryGetValue((int)action.RecipeNetworkId, out Item item);
-			_player.Inventory.UiInventory.Slots[50] = ItemFactory.GetItem(item.Id, item.Metadata, item.Count * action.craftCount);
+			_player.Inventory.UiInventory.Slots[50] = ItemFactory.GetItem(item.Id, item.Metadata, item.Count * action.TimesCrafted);
 		}
 
 		protected virtual void ProcessCraftCreativeAction(CraftCreativeAction action)

src/MiNET/MiNET/ItemStackInventoryManager.cs

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>MiNET-CobwebSMP</PackageId>
-    <Version>1.13.0.14</Version>
+    <Version>1.13.0.16</Version>
     <Authors>gurun</Authors>
     <Company>Niclas Olofsson</Company>
     <Description>MiNET - a Minecraft PocketEdition Server</Description>

src/MiNET/MiNET/MiNET.csproj

@@ -4368,6 +4368,7 @@ public enum LinkActions
 		public long riderId; // = null;
 		public byte linkType; // = null;
 		public byte unknown; // = null;
+		public float vehicleAngularVelocity; // = null;
 
 		public McpeSetEntityLink()
 		{
@@ -4386,6 +4387,7 @@ protected override void EncodePacket()
 			Write(linkType);
 			Write(unknown);
 			Write(false);
+			Write(vehicleAngularVelocity);
 
 			AfterEncode();
 		}
@@ -4403,6 +4405,7 @@ protected override void DecodePacket()
 			riderId = ReadSignedVarLong();
 			linkType = ReadByte();
 			unknown = ReadByte();
+			vehicleAngularVelocity = ReadFloat();
 
 			AfterDecode();
 		}
@@ -4418,6 +4421,7 @@ protected override void ResetPacket()
 			riderId=default(long);
 			linkType=default(byte);
 			unknown=default(byte);
+			vehicleAngularVelocity=default(float);
 		}
 
 	}
@@ -5533,6 +5537,7 @@ protected override void EncodePacket()
 			WriteSignedVarInt(dimension);
 			Write(position);
 			Write(respawn);
+			Write(false);
 
 			AfterEncode();
 		}
@@ -6949,6 +6954,7 @@ public partial class McpeSetTitle : Packet<McpeSetTitle>
 		public int fadeOutTime; // = null;
 		public string xuid; // = null;
 		public string platformOnlineId; // = null;
+		public string filteredString; // = null;
 
 		public McpeSetTitle()
 		{
@@ -6969,6 +6975,7 @@ protected override void EncodePacket()
 			WriteSignedVarInt(fadeOutTime);
 			Write(xuid);
 			Write(platformOnlineId);
+			Write(filteredString);
 
 			AfterEncode();
 		}
@@ -6989,6 +6996,7 @@ protected override void DecodePacket()
 			fadeOutTime = ReadSignedVarInt();
 			xuid = ReadString();
 			platformOnlineId = ReadString();
+			filteredString = ReadString();
 
 			AfterDecode();
 		}

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

@@ -1097,7 +1097,7 @@ public Transaction ReadTransaction()
 						FromPosition = ReadVector3(),
 						ClickPosition = ReadVector3(),
 						BlockRuntimeId = ReadUnsignedVarInt(),
-						ClientPredictedResult = ReadByte()
+						ClientPredictedResult = ReadUnsignedVarInt()
 			};
 					break;
 				case McpeInventoryTransaction.TransactionType.ItemUseOnEntity:
@@ -1267,15 +1267,16 @@ public void Write(ItemStackRequests requests)
 						{
 							Write((byte) McpeItemStackRequest.ActionType.CraftRecipe);
 							WriteUnsignedVarInt(ta.RecipeNetworkId);
-							Write(ta.ClientPredictedResult);
+							Write(ta.TimesCrafted);
 							break;
 						}
 
 						case CraftAutoAction ta:
 						{
 							Write((byte) McpeItemStackRequest.ActionType.CraftRecipeAuto);
 							WriteUnsignedVarInt(ta.RecipeNetworkId);
-							Write(ta.craftCount);
+							Write(ta.TimesCrafted2);
+							Write(ta.TimesCrafted);
 							Write((byte)ta.Ingredients.Count);
 							foreach (Item item in ta.Ingredients)
 							{
@@ -1461,15 +1462,16 @@ public ItemStackRequests ReadItemStackRequests()
 						{
 							var action = new CraftAction();
 							action.RecipeNetworkId = ReadUnsignedVarInt();
-							action.ClientPredictedResult = ReadByte();
+							action.TimesCrafted = ReadByte();
 							actions.Add(action);
 							break;
 						}
 						case McpeItemStackRequest.ActionType.CraftRecipeAuto:
 						{
 							var action = new CraftAutoAction();
 							action.RecipeNetworkId = ReadUnsignedVarInt();
-							action.craftCount = ReadByte();
+							action.TimesCrafted2 = ReadByte();
+							action.TimesCrafted = ReadByte();
 							var cou = ReadByte();
 							for (var a = 0; a < cou; a++)
 							{
@@ -1554,7 +1556,7 @@ public void Write(ItemStackResponses responses)
 				WriteUnsignedVarInt((uint) stackResponse.ResponseContainerInfos.Count);
 				foreach (StackResponseContainerInfo containerInfo in stackResponse.ResponseContainerInfos)
 				{
-					Write(new FullContainerName() { ContainerId = containerInfo.ContainerId, DynamicId = 0 });
+					Write(new FullContainerName() { ContainerId = containerInfo.ContainerId, DynamicId = containerInfo.DynamicId });
 					WriteUnsignedVarInt((uint) containerInfo.Slots.Count);
 					foreach (StackResponseSlotInfo slot in containerInfo.Slots)
 					{
@@ -1591,6 +1593,7 @@ public ItemStackResponses ReadItemStackResponses()
 					var containerInfo = new StackResponseContainerInfo();
 					var name = readFullContainerName();
 					containerInfo.ContainerId = name.ContainerId;
+					containerInfo.DynamicId = name.DynamicId;
 					var slotCount = ReadUnsignedVarInt();
 					containerInfo.Slots = new List<StackResponseSlotInfo>();
 

src/MiNET/MiNET/Net/Packet.cs

@@ -294,8 +294,11 @@ private static List<MessagePart> CreateMessageParts(Packet message, int mtuSize,
 			if (message.IsMcpe) Log.Error($"Got bedrock message in unexpected place {message.GetType().Name}");
 
 			int maxPayloadSizeNoSplit = mtuSize - RakOfflineHandler.UdpHeaderSize - 4 - GetHeaderSize(message.ReliabilityHeader, false);
+			int orderingIndex = 0;
 			bool split = encodedMessage.Length >= maxPayloadSizeNoSplit;
 
+			if (message.ReliabilityHeader.Reliability == Reliability.ReliableOrdered) orderingIndex = Interlocked.Increment(ref session.OrderingIndex);
+
 			List<(int @from, int length)> splits = ArraySplit(encodedMessage.Length, mtuSize - RakOfflineHandler.UdpHeaderSize - 4 /*datagram header*/ - GetHeaderSize(message.ReliabilityHeader, split));
 			int count = splits.Count;
 			if (count == 0) Log.Warn("Got zero parts back from split");
@@ -305,10 +308,10 @@ private static List<MessagePart> CreateMessageParts(Packet message, int mtuSize,
 				messagePart.ReliabilityHeader.Reliability = message.ReliabilityHeader.Reliability;
 				messagePart.ReliabilityHeader.ReliableMessageNumber = Interlocked.Increment(ref session.ReliableMessageNumber);
 				messagePart.ReliabilityHeader.OrderingChannel = 0;
-				messagePart.ReliabilityHeader.OrderingIndex = message.ReliabilityHeader.OrderingIndex;
+				messagePart.ReliabilityHeader.OrderingIndex = orderingIndex;
 				messagePart.ReliabilityHeader.HasSplit = false;
 				messagePart.Buffer = encodedMessage;
-
+				//Log.Warn($"1 part: {message.ReliabilityHeader.OrderingIndex} for {session.Username}");
 				return new List<MessagePart>(1) {messagePart};
 			}
 
@@ -326,13 +329,13 @@ private static List<MessagePart> CreateMessageParts(Packet message, int mtuSize,
 				messagePart.ReliabilityHeader.Reliability = message.ReliabilityHeader.Reliability;
 				messagePart.ReliabilityHeader.ReliableMessageNumber = Interlocked.Increment(ref session.ReliableMessageNumber);
 				messagePart.ReliabilityHeader.OrderingChannel = 0;
-				messagePart.ReliabilityHeader.OrderingIndex = message.ReliabilityHeader.OrderingIndex;
+				messagePart.ReliabilityHeader.OrderingIndex = orderingIndex;
 				messagePart.ReliabilityHeader.HasSplit = count > 1;
 				messagePart.ReliabilityHeader.PartCount = count;
 				messagePart.ReliabilityHeader.PartId = splitId;
 				messagePart.ReliabilityHeader.PartIndex = index++;
 				messagePart.Buffer = encodedMessage.Slice(span.@from, span.length);
-
+				//Log.Warn($"split part: {message.ReliabilityHeader.OrderingIndex} for {session.Username}");
 				messageParts.Add(messagePart);
 			}
 

src/MiNET/MiNET/Net/RakNet/Datagram.cs

@@ -436,7 +436,7 @@ private void ReceiveDatagram(ReadOnlyMemory<byte> receivedBytes, IPEndPoint clie
 
 			EnqueueAck(rakSession, datagram.Header.DatagramSequenceNumber);
 
-			if (Log.IsVerboseEnabled()) Log.Verbose($"Receive datagram #{datagram.Header.DatagramSequenceNumber} for {_endpoint}");
+			//Log.Debug($"Receive datagram #{datagram.Header.DatagramSequenceNumber} for {_endpoint}");
 
 			HandleDatagram(rakSession, datagram);
 			datagram.PutPool();
@@ -551,6 +551,7 @@ private void HandleAck(RakSession session, Ack ack, ConnectionInfo connectionInf
 
 			foreach ((int start, int end) range in ack.ranges)
 			{
+				//Log.Debug($"ACK: #{range.start} - #{range.end}");
 				Interlocked.Increment(ref connectionInfo.NumberOfAckReceive);
 
 				for (int i = range.start; i <= range.end; i++)
@@ -679,7 +680,7 @@ internal async Task UpdateAsync(RakSession session)
 					datagramTimeout = Math.Min(datagramTimeout, 3000);
 					datagramTimeout = Math.Max(datagramTimeout, 100);
 
-					if (datagram.RetransmitImmediate || elapsedTime >= datagramTimeout)
+					if (datagram.RetransmitImmediate || elapsedTime >= datagramTimeout/2)
 					{
 						if (!session.Evicted && session.WaitingForAckQueue.TryRemove(datagram.Header.DatagramSequenceNumber, out _))
 						{
@@ -759,6 +760,8 @@ public async Task SendDatagramAsync(RakSession session, Datagram datagram)
 				datagram.PutPool();
 			}
 
+			//Log.Debug($"Send datagram #{datagram.Header.DatagramSequenceNumber} for {session.Username}");
+
 			//lock (session.SyncRoot)
 			{
 				await SendDataAsync(buffer, length, session.EndPoint);