From 4a066378678af9e8840734b28bcfe5ba8a7d8b22 Mon Sep 17 00:00:00 2001
From: Shank <nicatron21@gmail.com>
Date: Sun, 29 May 2011 11:34:21 -0600
Subject: [PATCH] Fixed tile whitelist (hex of 0 is 0, which now has an
 exception) VERSION TICK: 2.1

---
 Terraria.csproj        |   1 -
 Terraria.suo           | Bin 55808 -> 55808 bytes
 Terraria/ShankShock.cs |  11 ++++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Terraria.csproj b/Terraria.csproj
index 49abc940..7c8d4ff3 100644
--- a/Terraria.csproj
+++ b/Terraria.csproj
@@ -64,7 +64,6 @@
     <Compile Include="Terraria\NetMessage.cs" />
     <Compile Include="Terraria\Dust.cs" />
     <Compile Include="Terraria\Player.cs" />
-    <Compile Include="Terraria\Steam.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Fonts\Combat_Text.xnb" />
diff --git a/Terraria.suo b/Terraria.suo
index 668e837bb63f2797860f3e4cf833df425940e26d..da93e289adb52fb27fff84690f0d11ffd55c31ee 100644
GIT binary patch
delta 889
zcmZXTUr19?9LMk3?&h6N+vc1;tfgi;^G{dH0@EDM|5}^o9~8k*5<yFvH?s(uVGqG5
zx3ALLgY+Ol1)@7XNSTe4DD=Sx2_JkYdJiA=AW_=6bB>?`pUeGyf4}oP=lss^xEGb~
zMdkdGLbZRu2Hq<=3hFtIt7B9$?2HCRBcq9NnQ?{TU^p2fz6;6TYXa?7>WKQqcJ{j2
z0vF$m)s!NLJWu!dMwNz3VWG(kj5k{$#c%P3n33QVtjsV)1sYCp@ERhomwgmtGx2mx
zx30u0Uj)hM6pk@Z(vdgJgyYOG9|=;5Q_wRbEh;1~v7a#o`>;Wv*HloONg0n-eL39e
zb`8-oUB`&*E}ZTZ;+SzFDo`oIp@O}wJeX5Ou%<7A+bXH6nKwQazpVB0NvV{}s}#E#
z^j={D5qRb+h|Wg%OuA+(gX3x|ui72BRqVx_n55=Ce@e_2`cd?05bD!W?ZvPTEwx6x
z?wJZUtqFpB89A{Wt&YRZw%K9Nseq#W6Q3A!wzu-?s6nNU9YXfK&4XC(tio<x7TxID
zP|@8UodPZI<}mrH0WQA};;b2ay<O;?sDWk3fNhHv-_DL=vpNa3fEroP?~{J$r#dhb
z$fTtIfRF<k3M>*xD@|zWn}cmIUyi1w%b5yP`ty-L-HrK@G`OeK5UCS}OEoCGVW4Rr
z1_%ueSE}P&><S3?7UN?VsBLtD;K$|{o^VyNG90`cii39`6;JP!;LS~wMee%8p$iog
zj+3jwaebxTw@0qKMtq`C$;t|{V#j=i0Ym;)1d9id_c#llhv%q!#zx?t&PFicgYy}W
z9gmTm#sg0$eowE_pN|Y`l1GXEBth8Y`{&%}gHJvy_*}M>+zm85sa3)y*;q%&4Hu~i
poe6v;R9bOq{?AU!UYe9Ju835eO-_uw0%^gaiM*jxv7`%H>tD0%Acp_|

delta 1360
zcmb7^drVtZ9LMiz&n>;IbY+$+CMB|oP-Jf1qSGxyJ4)PyVapy6mT6X@43<)$?FKW8
z>&!C$Stjd`IK&5th><^t^ek}+W7dtB>CBMe+xeJp=Oa^VviJx3y?tpkG4UjybI<qp
zxaW7yx#vbs>LVxhFP+lKD<w%<plMy>`ajS%K~(`4(6rVzV_XOB18(2}^<WFw3LHRq
z^fqRQ)a8XP6j6}Z(>Zw+IXD;Bc&)6kB?!3@(4l%eg>&EL_N-XsF&ZFv+8`2(++2}v
zhAhp*I8`osEf@3()5^)un8Q|&Q8N@}3<(&@A#52#xWGd*+>v(*h6N)!G)DQ#-NLEr
za}{QSUJO!Y6}yvFCyG5r6~=<JLxh*QWjdE%87r%1MhmQY*%W)kPz$kBrQhxMYS|)O
z&Sl-eGV#!g8fLr>zFRZFiIv65fn}1kv1+T!P2H=H(}crp7^*uk?Jp8%9Z`jLt>F|I
zG|?K@Aa(6Ai<Wf>OKkIu(WuQ)mVM7Q)LB|dk?k(+8ErVv3$wn4Z9FF}M7Z%1JNORN
zyWl<WKKKB92tERrz{lVd@G1BVTn3+mFTj`JEATb=27C*?16RQJ;0N#{_z5iFAg<#1
zGx#N~VWQclRW!WOO8(k@irk~p1DnjEWXGGb7}(Xu=&avC$DUN_ttn2yqfv4^W23R=
z9n{ysiSHSw_`K8b;NI3&Uyv?GDrlzXbuLTQFH`sIk(_`p+~xP~hvRnoZHq-%TCXx}
zuht4Brjw-SQv$s;ei8i*Af4M4?A#snb|7~H-9K+qa<w4MO>;eu=HksAzEH@!+m{KD
z*TPvqf%(Gd>2cOd&$ew(pO#tHas$*o)I>Ees<L+EZ_uj&qPwQoGl}M!i|DC9356dY
z#R~hWx2ll*omQH?7|Kgel3n12f=Y(;WGjz1V7wY*t)|mtI;37-oN}RG64yNIlG-I+
z>2w(k*YJJIn6Kwf;oNta{d*x5Oxw4EvHkHJb1>))wtIK}wGAof-#4{_P1Et-y67YE
z=o43HJf>2-*+~;?&G^2w>oJmC<imqjHb#>pCn!E;k+q9AN=xrJF>=JPc(2qhwMZ+Z
zW+?=78F{CgaJ~i_ZnrRn<_<Se-wRyWo-SdrW9N0;j3DhEibS7DFPx)i^rW*@v0DT?
zdJ|*&Qd{mTrIwa496<L_BRNMbVxs>wM#F8@|J-A-eBccGpH)An|F1G{W5P4~t10=5
T2v53YR+B9FvE?E$X|n$bYt+49

diff --git a/Terraria/ShankShock.cs b/Terraria/ShankShock.cs
index 821717fe..b06e6d16 100644
--- a/Terraria/ShankShock.cs
+++ b/Terraria/ShankShock.cs
@@ -9,7 +9,7 @@ namespace Terraria
 {
 	class ShankShock
 	{
-        private static double version = 2;
+        private static double version = 2.1;
         private static bool shownVersion = false;
 
         public static bool killGuide = true;
@@ -242,7 +242,7 @@ namespace Terraria
             if (!System.IO.File.Exists(saveDir +"bans.txt")) { createFile(saveDir + "bans.txt"); }
             if (!System.IO.File.Exists(saveDir +"cheaters.txt")) { createFile(saveDir + "cheaters.txt"); }
             if (!System.IO.File.Exists(saveDir +"admins.txt")) { createFile(saveDir + "admins.txt");  }
-            if (!System.IO.File.Exists(saveDir + "grief.txt")) { createFile(saveDir + "grief.txt"); }
+            if (!System.IO.File.Exists(saveDir +"grief.txt")) { createFile(saveDir + "grief.txt"); }
             if (!System.IO.File.Exists(saveDir +"config.txt"))
             {
                 createFile(saveDir + "config.txt");
@@ -291,6 +291,11 @@ namespace Terraria
             TextReader tr2 = new StreamReader(saveDir + "tiles.txt");
             tileWhitelist = tr2.ReadToEnd(); tr2.Close();
             string hexValue = _tile.ToString("X");
+            if (hexValue == "0")
+            {
+                return false;
+            }
+            Console.WriteLine(hexValue);
             return tileWhitelist.Contains(hexValue);
         }
 
@@ -301,7 +306,7 @@ namespace Terraria
 
         public static void handleGrief(int ply)
         {
-            if (banTnt == false && kickTnt == false) { return; }
+            
             if (banTnt) { _writeGrief(ply); }
             ShankShock.broadcast(findPlayer(ply) + " was " + (banTnt ? "banned " : "kicked ") + "for kill tile abuse.");
             if (kickTnt) { kick(ply); }