Update to 1.19.10

ConcreteMC · Jul 22, 2022 · 13404e8 · 13404e8
1 parent 6348149
commit 13404e8
Show file tree

Hide file tree

Showing 4 changed files with 26,280 additions and 13,913 deletions.
diff --git a/src/Alex/Entities/BlockEntities/BeaconBlockEntity.cs b/src/Alex/Entities/BlockEntities/BeaconBlockEntity.cs
@@ -111,7 +111,7 @@ protected override void ReadFrom(NbtCompound compound)
 		}
 
 		if (compound.TryGet<NbtInt>("Secondary", out var secondary)
-		    || compound.TryGet<NbtInt>("secondary", out primary))
+		    || compound.TryGet<NbtInt>("secondary", out secondary))
 		{
 			if (secondary.Value >= 0)
 			{

diff --git a/src/Alex/Net/Bedrock/BedrockClientPacketHandler.cs b/src/Alex/Net/Bedrock/BedrockClientPacketHandler.cs
@@ -240,12 +240,12 @@ public void HandleMcpeSetTime(McpeSetTime message)
 
 			Client.ChangeDimensionResetEvent.Set();
 		}
-
+		
 		public void HandleMcpeStartGame(McpeStartGame message)
 		{
 			Log.Warn($"Experimental gameplay override={message.levelSettings.experimentalGameplayOverride} Experiments={message.levelSettings.experiments.Count} BaseGameVersion={message.levelSettings.gameVersion}");
 
-			if (message.levelSettings.gameVersion.Trim().StartsWith("1.17"))
+			if ( message.levelSettings.gameVersion.Trim().StartsWith("1.17"))
 			{
 				ChunkProcessor.WorldSettings = new WorldSettings(256, 0);
 			}
@@ -407,9 +407,10 @@ public void HandleMcpeAddPlayer(McpeAddPlayer message)
 					remotePlayer.HandleMetadata(message.metadata);
 				}
 
-				UpdateEntityAdventureFlags(
-					remotePlayer, message.flags, message.actionPermissions, message.commandPermission,
-					message.permissionLevel, message.customStoredPermissions);
+				//TODO: Fix adventure flags
+				//UpdateEntityAdventureFlags(
+				//	remotePlayer, message.flags, message.actionPermissions, message.commandPermission,
+				//	message.permissionLevel, message.customStoredPermissions);
 
 				Client.World.SpawnEntity(remotePlayer);
 
@@ -704,9 +705,17 @@ public void HandleMcpeAvailableEntityIdentifiers(McpeAvailableEntityIdentifiers
 			{
 				foreach (NbtCompound tag in ids.ToArray<NbtCompound>())
 				{
-					if (tag.TryGet("id", out NbtString id) && tag.TryGet("rid", out NbtInt realId))
+					if (tag.TryGet("id", out NbtString id) && tag.TryGet("rid", out var realId))
 					{
-						_entityIdentifiers[id.Value] = realId.Value;
+						int identifier = 0;
+
+						if (realId is NbtInt nbtInt)
+							identifier = nbtInt.Value;
+
+						if (realId is NbtByte nbtByte)
+							identifier = nbtByte.Value;
+
+						_entityIdentifiers[id.Value] = identifier;
 
 						if (LoggingConstants.LogServerEntityDefinitions)
 #pragma warning disable CS0162