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

Fixed tile whitelist (hex of 0 is 0, which now has an exception)

Browse source 
VERSION TICK: 2.1
This commit is contained in:
Shank 2011-05-29 11:34:21 -06:00
parent af9fd921bf
commit 4a06637867
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Terraria.csproj
View file

@ -64,7 +64,6 @@
<Compile Include="Terraria\NetMessage.cs" /> <Compile Include="Terraria\NetMessage.cs" />
<Compile Include="Terraria\Dust.cs" /> <Compile Include="Terraria\Dust.cs" />
<Compile Include="Terraria\Player.cs" /> <Compile Include="Terraria\Player.cs" />
<Compile Include="Terraria\Steam.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Fonts\Combat_Text.xnb" /> <None Include="Fonts\Combat_Text.xnb" />

BIN
Terraria.suo
View file

Binary file not shown.

9
Terraria/ShankShock.cs
View file

@ -9,7 +9,7 @@ namespace Terraria
{ {
class ShankShock class ShankShock
{ {
private static double version = 2; private static double version = 2.1;
private static bool shownVersion = false; private static bool shownVersion = false;
public static bool killGuide = true; public static bool killGuide = true;
@ -291,6 +291,11 @@ namespace Terraria
TextReader tr2 = new StreamReader(saveDir + "tiles.txt"); TextReader tr2 = new StreamReader(saveDir + "tiles.txt");
tileWhitelist = tr2.ReadToEnd(); tr2.Close(); tileWhitelist = tr2.ReadToEnd(); tr2.Close();
string hexValue = _tile.ToString("X"); string hexValue = _tile.ToString("X");
if (hexValue == "0")
{
return false;
}
Console.WriteLine(hexValue);
return tileWhitelist.Contains(hexValue); return tileWhitelist.Contains(hexValue);
} }
@ -301,7 +306,7 @@ namespace Terraria
public static void handleGrief(int ply) public static void handleGrief(int ply)
{ {
if (banTnt == false && kickTnt == false) { return; }
if (banTnt) { _writeGrief(ply); } if (banTnt) { _writeGrief(ply); }
ShankShock.broadcast(findPlayer(ply) + " was " + (banTnt ? "banned " : "kicked ") + "for kill tile abuse."); ShankShock.broadcast(findPlayer(ply) + " was " + (banTnt ? "banned " : "kicked ") + "for kill tile abuse.");
if (kickTnt) { kick(ply); } if (kickTnt) { kick(ply); }