mirror of
				https://github.com/DarkflameUniverse/DarkflameServer.git
				synced 2025-11-03 22:21:59 +00:00 
			
		
		
		
	fix: mail claiming item (#1758)
* Update build-and-test.yml * Update build-and-test.yml * Update build-and-test.yml * Update build-and-test.yml * Update build-and-test.yml * Update build-and-test.yml * specify up to 3.31 * fix: mail claiming item tested that I can claim an item without an error
This commit is contained in:
		
							
								
								
									
										12
									
								
								.github/workflows/build-and-test.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								.github/workflows/build-and-test.yml
									
									
									
									
										vendored
									
									
								
							@@ -16,12 +16,12 @@ jobs:
 | 
			
		||||
        os: [ windows-2022, ubuntu-22.04, macos-13 ]
 | 
			
		||||
 | 
			
		||||
    steps:
 | 
			
		||||
    - uses: actions/checkout@v4
 | 
			
		||||
    - uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
 | 
			
		||||
      with:
 | 
			
		||||
        submodules: true
 | 
			
		||||
    - name: Add msbuild to PATH (Windows only)
 | 
			
		||||
      if: ${{ matrix.os == 'windows-2022' }}
 | 
			
		||||
      uses: microsoft/setup-msbuild@v2
 | 
			
		||||
      uses: microsoft/setup-msbuild@767f00a3f09872d96a0cb9fcd5e6a4ff33311330
 | 
			
		||||
      with:
 | 
			
		||||
        vs-version: '[17,18)'
 | 
			
		||||
        msbuild-architecture: x64
 | 
			
		||||
@@ -30,12 +30,16 @@ jobs:
 | 
			
		||||
      run: |
 | 
			
		||||
        brew install openssl@3
 | 
			
		||||
        sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
 | 
			
		||||
    - name: Get CMake 3.x
 | 
			
		||||
      uses: lukka/get-cmake@28983e0d3955dba2bb0a6810caae0c6cf268ec0c
 | 
			
		||||
      with:
 | 
			
		||||
        cmakeVersion: "~3.25.0"  # <--= optional, use most recent 3.25.x version
 | 
			
		||||
    - name: cmake
 | 
			
		||||
      uses: lukka/run-cmake@v10
 | 
			
		||||
      uses: lukka/run-cmake@67c73a83a46f86c4e0b96b741ac37ff495478c38
 | 
			
		||||
      with:
 | 
			
		||||
        workflowPreset: "ci-${{matrix.os}}"
 | 
			
		||||
    - name: artifacts
 | 
			
		||||
      uses: actions/upload-artifact@v4
 | 
			
		||||
      uses: actions/upload-artifact@6027e3dd177782cd8ab9af838c04fd81a07f1d47
 | 
			
		||||
      with:
 | 
			
		||||
        name: build-${{matrix.os}}
 | 
			
		||||
        path: |
 | 
			
		||||
 
 | 
			
		||||
@@ -78,7 +78,7 @@ git clone --recursive https://github.com/DarkflameUniverse/DarkflameServer
 | 
			
		||||
 | 
			
		||||
### Windows packages
 | 
			
		||||
Ensure that you have either the [MSVC C++ compiler](https://visualstudio.microsoft.com/vs/features/cplusplus/) (recommended) or the [Clang compiler](https://github.com/llvm/llvm-project/releases/) installed.
 | 
			
		||||
You'll also need to download and install [CMake](https://cmake.org/download/) (version <font size="4">**CMake version 3.25**</font> or later!).
 | 
			
		||||
You'll also need to download and install [CMake](https://cmake.org/download/) (<font size="4">**version 3.25**</font> up to <font size="4">**version 3.31**</font>!).
 | 
			
		||||
 | 
			
		||||
### MacOS packages
 | 
			
		||||
Ensure you have [brew](https://brew.sh) installed.
 | 
			
		||||
@@ -100,7 +100,7 @@ sudo apt install build-essential gcc zlib1g-dev libssl-dev openssl mariadb-serve
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
#### Required CMake version
 | 
			
		||||
This project uses <font size="4">**CMake version 3.25**</font> or higher and as such you will need to ensure you have this version installed.
 | 
			
		||||
This project uses <font size="4">**CMake version 3.25**</font> up to <font size="4">**version 3.31**</font> and as such you will need to ensure you have this version installed.
 | 
			
		||||
You can check your CMake version by using the following command in a terminal.
 | 
			
		||||
```bash
 | 
			
		||||
cmake --version
 | 
			
		||||
 
 | 
			
		||||
@@ -181,6 +181,7 @@ namespace Mail {
 | 
			
		||||
 | 
			
		||||
	void AttachmentCollectRequest::Handle() {
 | 
			
		||||
		AttachmentCollectResponse response;
 | 
			
		||||
		response.mailID = mailID;
 | 
			
		||||
		auto inv = player->GetComponent<InventoryComponent>();
 | 
			
		||||
 | 
			
		||||
		if (mailID > 0 && playerID == player->GetObjectID() && inv) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user