Skip to content

Commit

Permalink
v1.4.2
Browse files Browse the repository at this point in the history
* Restructured player code
  • Loading branch information
hamstar0 committed Aug 8, 2018
1 parent 81da7aa commit cc57b15
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 11 deletions.
38 changes: 33 additions & 5 deletions CapitalismPlayer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,19 @@ public override void clientClone( ModPlayer clone ) {
myclone.Logic = this.Logic;
}


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

public override void SyncPlayer( int to_who, int from_who, bool new_player ) {
var mymod = (CapitalismMod)this.mod;

if( Main.netMode == 2 ) {
if( to_who == -1 && from_who == this.player.whoAmI ) {
this.OnServerConnect();
}
}
}

public override void OnEnterWorld( Player player ) {
if( player.whoAmI != this.player.whoAmI ) { return; }

Expand All @@ -36,17 +47,34 @@ public override void OnEnterWorld( Player player ) {
if( Main.netMode == 0 ) {
if( !mymod.ConfigJson.LoadFile() ) {
mymod.ConfigJson.SaveFile();
ErrorLogger.Log( "Durability config " + CapitalismConfigData.ConfigVersion.ToString() + " created (ModPlayer.OnEnterWorld())." );
}
}


if( Main.netMode == 0 ) {
this.OnSingleConnect();
}
if( Main.netMode == 1 ) {
Promises.AddWorldLoadOncePromise( () => {
PacketProtocol.QuickRequestToServer<ModSettingsProtocol>();
PacketProtocol.QuickRequestToServer<WorldDataProtocol>();
} );
this.OnClientConnect();
}
}

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

private void OnSingleConnect() {
}

private void OnClientConnect() {
Promises.AddWorldLoadOncePromise( () => {
PacketProtocol.QuickRequestToServer<ModSettingsProtocol>();
PacketProtocol.QuickRequestToServer<WorldDataProtocol>();
} );
}

private void OnServerConnect() {
}


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

public override void Load( TagCompound tags ) {
Expand Down
6 changes: 0 additions & 6 deletions Config.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,6 @@ public bool UpdateToLatestVersion() {
return false;
}

if( vers_since < new Version(1, 2, 1) ) {
this.FemaleBloodMoonMarkupPercent = new_config.FemaleBloodMoonMarkupPercent;
this.LovestruckMarkdownPercent = new_config.LovestruckMarkdownPercent;
this.StinkyMarkupPercent = new_config.StinkyMarkupPercent;
}

this.VersionSinceUpdate = CapitalismConfigData.ConfigVersion.ToString();

return true;
Expand Down

0 comments on commit cc57b15

Please sign in to comment.