diff --git a/.gitignore b/.gitignore index ecd7ed6..7a45d8f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,6 @@ bin/ obj/ Properties/ .gitignore +.gitattributes desktop.ini copy_sources.bat \ No newline at end of file diff --git a/CapitalismPlayer.cs b/CapitalismPlayer.cs index 205561b..5f65cac 100644 --- a/CapitalismPlayer.cs +++ b/CapitalismPlayer.cs @@ -40,14 +40,15 @@ public override void SyncPlayer( int to_who, int from_who, bool new_player ) { } public override void OnEnterWorld( Player player ) { - if( player.whoAmI != this.player.whoAmI ) { return; } + if( player.whoAmI != Main.myPlayer ) { return; } + if( this.player.whoAmI != Main.myPlayer ) { return; } var mymod = (CapitalismMod)this.mod; if( Main.netMode == 0 ) { if( !mymod.ConfigJson.LoadFile() ) { mymod.ConfigJson.SaveFile(); - ErrorLogger.Log( "Durability config " + CapitalismConfigData.ConfigVersion.ToString() + " created (ModPlayer.OnEnterWorld())." ); + ErrorLogger.Log( "Capitalism config " + CapitalismConfigData.ConfigVersion.ToString() + " created (ModPlayer.OnEnterWorld())." ); } } diff --git a/NetProtocol/ModSettingsProtocol.cs b/NetProtocol/ModSettingsProtocol.cs index 09e78c9..8ec21cb 100644 --- a/NetProtocol/ModSettingsProtocol.cs +++ b/NetProtocol/ModSettingsProtocol.cs @@ -1,4 +1,5 @@ using HamstarHelpers.Components.Network; +using HamstarHelpers.Components.Network.Data; namespace Capitalism.NetProtocol { @@ -6,10 +7,18 @@ class ModSettingsProtocol : PacketProtocol { public CapitalismConfigData Settings; + //////////////// + + private ModSettingsProtocol( PacketProtocolDataConstructorLock ctor_lock ) { } + + //////////////// + protected override void SetServerDefaults() { this.Settings = CapitalismMod.Instance.Config; } + //////////////// + protected override void ReceiveWithClient() { CapitalismMod.Instance.ConfigJson.SetData( this.Settings ); } diff --git a/NetProtocol/WorldDataProtocol.cs b/NetProtocol/WorldDataProtocol.cs index dbe935f..d5548af 100644 --- a/NetProtocol/WorldDataProtocol.cs +++ b/NetProtocol/WorldDataProtocol.cs @@ -1,4 +1,5 @@ using HamstarHelpers.Components.Network; +using HamstarHelpers.Components.Network.Data; namespace Capitalism.NetProtocol { @@ -6,12 +7,20 @@ class WorldDataProtocol : PacketProtocol { public string OldID; + //////////////// + + private WorldDataProtocol( PacketProtocolDataConstructorLock ctor_lock ) { } + + //////////////// + protected override void SetServerDefaults() { var myworld = CapitalismMod.Instance.GetModWorld(); this.OldID = myworld.ID; } + //////////////// + protected override void ReceiveWithClient() { if( !string.IsNullOrEmpty(this.OldID) ) { var myworld = CapitalismMod.Instance.GetModWorld(); diff --git a/build.txt b/build.txt index 6516e3d..0b2de75 100644 --- a/build.txt +++ b/build.txt @@ -1,8 +1,7 @@ author = hamstar version = 1.4.2 displayName = Capitalism -modReferences = HamstarHelpers@2.0.1 +modReferences = HamstarHelpers@2.0.2 buildIgnore = *.csproj, *.user, *.bat, obj\*, bin\*, .vs\*, .git\* -includePDB = true languageVersion = 6 homepage = https://forums.terraria.org/index.php?threads/capitalism.52930/ \ No newline at end of file