Update to 1.1.1

Switch to v2 of the sqlite lib. v4 has a bug when run under .Net.
This commit is contained in:
Deathmax 2011-12-16 09:02:59 +08:00
parent a2a1486ea1
commit b23b6789f2
7 changed files with 11 additions and 10 deletions

Binary file not shown.

View file

@ -537,7 +537,7 @@ namespace TShockAPI
args.Player.TileThreshold++; args.Player.TileThreshold++;
var coords = new Vector2(x, y); var coords = new Vector2(x, y);
if (!args.Player.TilesDestroyed.ContainsKey(coords)) if (!args.Player.TilesDestroyed.ContainsKey(coords))
args.Player.TilesDestroyed.Add(coords, Main.tile[x, y].Data); args.Player.TilesDestroyed.Add(coords, Main.tile[x, y]);
} }
if ((DateTime.UtcNow - args.Player.LastExplosive).TotalMilliseconds < 1000) if ((DateTime.UtcNow - args.Player.LastExplosive).TotalMilliseconds < 1000)

View file

@ -36,5 +36,5 @@ using System.Runtime.InteropServices;
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.3.4.1215")] [assembly: AssemblyVersion("3.3.4.1216")]
[assembly: AssemblyFileVersion("3.3.4.1215")] [assembly: AssemblyFileVersion("3.3.4.1216")]

View file

@ -31,7 +31,7 @@ namespace TShockAPI
public static readonly TSServerPlayer Server = new TSServerPlayer(); public static readonly TSServerPlayer Server = new TSServerPlayer();
public static readonly TSPlayer All = new TSPlayer("All"); public static readonly TSPlayer All = new TSPlayer("All");
public int TileThreshold { get; set; } public int TileThreshold { get; set; }
public Dictionary<Vector2, TileData> TilesDestroyed { get; protected set; } public Dictionary<Vector2, Tile> TilesDestroyed { get; protected set; }
public bool SyncHP { get; set; } public bool SyncHP { get; set; }
public bool SyncMP { get; set; } public bool SyncMP { get; set; }
public Group Group { get; set; } public Group Group { get; set; }
@ -145,14 +145,14 @@ namespace TShockAPI
public TSPlayer(int index) public TSPlayer(int index)
{ {
TilesDestroyed = new Dictionary<Vector2, TileData>(); TilesDestroyed = new Dictionary<Vector2, Tile>();
Index = index; Index = index;
Group = new Group("null"); Group = new Group("null");
} }
protected TSPlayer(String playerName) protected TSPlayer(String playerName)
{ {
TilesDestroyed = new Dictionary<Vector2, TileData>(); TilesDestroyed = new Dictionary<Vector2, Tile>();
Index = -1; Index = -1;
FakePlayer = new Player { name = playerName, whoAmi = -1 }; FakePlayer = new Player { name = playerName, whoAmi = -1 };
Group = new Group("null"); Group = new Group("null");
@ -418,12 +418,12 @@ namespace TShockAPI
NetMessage.SendData((int)PacketTypes.NpcStrike, -1, -1, "", npcid, damage, knockBack, hitDirection); NetMessage.SendData((int)PacketTypes.NpcStrike, -1, -1, "", npcid, damage, knockBack, hitDirection);
} }
public void RevertKillTile(Dictionary<Vector2, TileData> destroyedTiles) public void RevertKillTile(Dictionary<Vector2, Tile> destroyedTiles)
{ {
// Update Main.Tile first so that when tile sqaure is sent it is correct // Update Main.Tile first so that when tile sqaure is sent it is correct
foreach (KeyValuePair<Vector2, TileData> entry in destroyedTiles) foreach (KeyValuePair<Vector2, Tile> entry in destroyedTiles)
{ {
Main.tile[(int)entry.Key.X, (int)entry.Key.Y].Data = entry.Value; Main.tile[(int)entry.Key.X, (int)entry.Key.Y] = entry.Value;
Log.Debug(string.Format("Reverted DestroyedTile(TileXY:{0}_{1}, Type:{2})", Log.Debug(string.Format("Reverted DestroyedTile(TileXY:{0}_{1}, Type:{2})",
entry.Key.X, entry.Key.Y, Main.tile[(int)entry.Key.X, (int)entry.Key.Y].type)); entry.Key.X, entry.Key.Y, Main.tile[(int)entry.Key.X, (int)entry.Key.Y].type));
} }

View file

@ -45,7 +45,7 @@ using TShockAPI.Net;
namespace TShockAPI namespace TShockAPI
{ {
[APIVersion(1, 9)] [APIVersion(1, 10)]
public class TShock : TerrariaPlugin public class TShock : TerrariaPlugin
{ {
public static readonly Version VersionNum = Assembly.GetExecutingAssembly().GetName().Version; public static readonly Version VersionNum = Assembly.GetExecutingAssembly().GetName().Version;

View file

@ -356,6 +356,7 @@ namespace TShockAPI
try try
{ {
item.prefix = (byte) i; item.prefix = (byte) i;
item.AffixName();
if (item.name.Trim().ToLower() == name.ToLower()) if (item.name.Trim().ToLower() == name.ToLower())
return new List<int> { i }; return new List<int> { i };
if (item.name.Trim().ToLower().StartsWith(name.ToLower())) if (item.name.Trim().ToLower().StartsWith(name.ToLower()))