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

Fail auto-merge, fixed.

Browse source
This commit is contained in:
Deathmax 2011-06-05 13:21:10 +08:00
parent 59e73e996c
commit 8d375506b4
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
TShockAPI/TShock.cs
View file

@ -377,11 +377,8 @@ namespace TShockAPI
} }
} }
} }
<<<<<<< HEAD
else if (e.MsgID == 0x22) // Client only KillTile else if (e.MsgID == 0x22) // Client only KillTile
e.Handled = true; // Client only uses it for chests, but sends regular 17 as well. e.Handled = true; // Client only uses it for chests, but sends regular 17 as well.
=======
>>>>>>> master
} }
catch (Exception ex) catch (Exception ex)
{ {