themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Include geoip.dat file again

Browse source 
This should allow the GeoIP.dat file to be found, and used the same way it used to on TShock 4.
It appears I had missed including this in the upgrade, and simply allowing it to copy to the output will allow the system to start working again.
Confirmed by enabling in config and joining via mobile (external network) and my country has appeared, N/A otherwise (local network)
Note: only ipv4 was tested.
This commit is contained in:
Luke 2022-10-22 21:45:31 +10:00
parent 272ad941bd
commit 0c2d194d02
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
TShockLauncher/TShockLauncher.csproj
View file

@ -19,6 +19,13 @@
</Reference>
</ItemGroup>
<ItemGroup>
<None Include="..\prebuilts\GeoIP.dat">
<Link>GeoIP.dat</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
<PackageReference Include="MySql.Data" Version="8.0.31" />
@ -84,7 +91,7 @@
</Target>
<Target Name="MoveBin" AfterTargets="Publish">
<ItemGroup>
<MoveBinaries Include="$(PublishDir)*" Exclude="$(PublishDir)\TShock.Server*" />
<MoveBinaries Include="$(PublishDir)*" Exclude="$(PublishDir)\TShock.Server*;$(PublishDir)\GeoIP.dat" />
</ItemGroup>
<Move SourceFiles="@(MoveBinaries)" DestinationFolder="$(PublishDir)bin" ContinueOnError="true" />
</Target>

1
docs/changelog.md
View file

@ -63,6 +63,7 @@ Use past tense when adding new entries; sign your name off when you add or chang
* Added localization support for console spam reduction. (@KawaiiYuyu)
* Added an internationalization system. The base for the i18n system was built by Janet Blackquill ([@pontaoski](https://github.com/pontaoski)). A small donation in her honor was made to the [KDE project](https://kde.org/) as a thankyou for this work. This also includes the `TSHOCK_LANGUAGE` environment variable. Setting `TSHOCK_LANGUAGE=tok` will enable a small number of [Toki Pona](https://tokipona.org/) translations as a proof-of-concept. (@pontaoski)
* Added support for Terraria 1.4.4.6, through OTAPI 3.1.5. (@SignatureBeef)
* Added GeoIP.dat back to the included list of files. (@SignatureBeef)
## TShock 4.5.18
* Fixed `TSPlayer.GiveItem` not working if the player is in lava. (@PotatoCider)