Skip to content

Commit

Permalink
v1.4.2 (missed some spots)
Browse files Browse the repository at this point in the history
  • Loading branch information
hamstar0 committed Aug 9, 2018
1 parent cc57b15 commit 64f7b88
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ bin/
obj/
Properties/
.gitignore
.gitattributes
desktop.ini
copy_sources.bat
5 changes: 3 additions & 2 deletions CapitalismPlayer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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())." );
}
}

Expand Down
9 changes: 9 additions & 0 deletions NetProtocol/ModSettingsProtocol.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
using HamstarHelpers.Components.Network;
using HamstarHelpers.Components.Network.Data;


namespace Capitalism.NetProtocol {
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 );
}
Expand Down
9 changes: 9 additions & 0 deletions NetProtocol/WorldDataProtocol.cs
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
using HamstarHelpers.Components.Network;
using HamstarHelpers.Components.Network.Data;


namespace Capitalism.NetProtocol {
class WorldDataProtocol : PacketProtocol {
public string OldID;


////////////////

private WorldDataProtocol( PacketProtocolDataConstructorLock ctor_lock ) { }

////////////////

protected override void SetServerDefaults() {
var myworld = CapitalismMod.Instance.GetModWorld<CapitalismWorld>();

this.OldID = myworld.ID;
}

////////////////

protected override void ReceiveWithClient() {
if( !string.IsNullOrEmpty(this.OldID) ) {
var myworld = CapitalismMod.Instance.GetModWorld<CapitalismWorld>();
Expand Down
3 changes: 1 addition & 2 deletions build.txt
Original file line number Diff line number Diff line change
@@ -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/

0 comments on commit 64f7b88

Please sign in to comment.