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

Update submodule, fix NetTile, tick version

Browse source
This commit is contained in:
MarioE 2014-02-13 21:52:32 -05:00
parent 68b171ab42
commit cabdb7aa8d
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TShockAPI/Net/NetTile.cs
View file

@ -45,6 +45,7 @@ namespace TShockAPI.Net
public byte WallColor { get; set; } public byte WallColor { get; set; }
public bool Slope { get; set; } public bool Slope { get; set; }
public bool Slope2 { get; set; } public bool Slope2 { get; set; }
public bool Slope3 { get; set; }
public bool HasColor public bool HasColor
{ {
@ -150,6 +151,9 @@ namespace TShockAPI.Net
if (Slope2) if (Slope2)
flags2 |= TileFlags2.Slope2; flags2 |= TileFlags2.Slope2;
if (Slope3)
flags2 |= TileFlags2.Slope3;
stream.WriteInt8((byte)flags2); stream.WriteInt8((byte)flags2);
@ -192,6 +196,7 @@ namespace TShockAPI.Net
Wire3 = flags2.HasFlag(TileFlags2.Wire3); Wire3 = flags2.HasFlag(TileFlags2.Wire3);
Slope = flags2.HasFlag(TileFlags2.Slope); Slope = flags2.HasFlag(TileFlags2.Slope);
Slope2 = flags2.HasFlag(TileFlags2.Slope2); Slope2 = flags2.HasFlag(TileFlags2.Slope2);
Slope3 = flags2.HasFlag(TileFlags2.Slope3);
if (flags2.HasFlag(TileFlags2.Color)) if (flags2.HasFlag(TileFlags2.Color))
{ {
@ -270,6 +275,7 @@ namespace TShockAPI.Net
Color = 4, Color = 4,
WallColor = 8, WallColor = 8,
Slope = 16, Slope = 16,
Slope2 = 32 Slope2 = 32,
Slope3 = 64
} }
} }

2
TShockAPI/TShock.cs
View file

@ -41,7 +41,7 @@ using System.Threading.Tasks;
namespace TShockAPI namespace TShockAPI
{ {
[ApiVersion(1, 14)] [ApiVersion(1, 15)]
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;

2
TerrariaServerAPI

@ -1 +1 @@
Subproject commit 0fe91dd05a5a54dff48d5ce61c7e3275c393a8b6 Subproject commit 943e996ca3e9ad9df981f36d98468c591fc54a7f