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

VERSION TICK: 3.4.1.1221

Browse source 
Merge branch 'general-devel'

Conflicts:
	TShockAPI/Properties/AssemblyInfo.cs
This commit is contained in:
Lucas Nicodemus 2011-12-21 13:10:53 -07:00
commit 6239e544c6
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
TShockAPI/Properties/AssemblyInfo.cs
View file

@ -35,5 +35,6 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.4.0.1221")] [assembly: AssemblyVersion("3.4.1.1221")]
[assembly: AssemblyFileVersion("3.4.0.1221")] [assembly: AssemblyFileVersion("3.4.1.1221")]

5
TShockAPI/TShock.cs
View file

@ -295,7 +295,10 @@ namespace TShockAPI
{ {
if (disposing) if (disposing)
{ {
Geo.Dispose(); if (Geo != null)
{
Geo.Dispose();
}
GameHooks.PostInitialize -= OnPostInit; GameHooks.PostInitialize -= OnPostInit;
GameHooks.Update -= OnUpdate; GameHooks.Update -= OnUpdate;
ServerHooks.Join -= OnJoin; ServerHooks.Join -= OnJoin;