Changes to NetTile
NetTile now has wire flag and same tile number.
This commit is contained in:
parent
3ab1bb24b4
commit
0a2ab6cc1c
1 changed files with 12 additions and 0 deletions
|
|
@ -32,6 +32,7 @@ namespace TShockAPI.Net
|
||||||
public byte Wall { get; set; }
|
public byte Wall { get; set; }
|
||||||
public byte Liquid { get; set; }
|
public byte Liquid { get; set; }
|
||||||
public bool Lava { get; set; }
|
public bool Lava { get; set; }
|
||||||
|
public bool Wire { get; set; }
|
||||||
|
|
||||||
public bool HasWall { get { return Wall > 0; } }
|
public bool HasWall { get { return Wall > 0; } }
|
||||||
public bool HasLiquid { get { return Liquid > 0; } }
|
public bool HasLiquid { get { return Liquid > 0; } }
|
||||||
|
|
@ -46,6 +47,7 @@ namespace TShockAPI.Net
|
||||||
Wall = 0;
|
Wall = 0;
|
||||||
Liquid = 0;
|
Liquid = 0;
|
||||||
Lava = false;
|
Lava = false;
|
||||||
|
Wire = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public NetTile(Stream stream)
|
public NetTile(Stream stream)
|
||||||
|
|
@ -67,6 +69,8 @@ namespace TShockAPI.Net
|
||||||
if (HasLiquid)
|
if (HasLiquid)
|
||||||
flags |= TileFlags.Liquid;
|
flags |= TileFlags.Liquid;
|
||||||
|
|
||||||
|
if (Wire)
|
||||||
|
flags |= TileFlags.Wire;
|
||||||
|
|
||||||
stream.WriteInt8((byte)flags);
|
stream.WriteInt8((byte)flags);
|
||||||
|
|
||||||
|
|
@ -88,6 +92,8 @@ namespace TShockAPI.Net
|
||||||
stream.WriteInt8(Liquid);
|
stream.WriteInt8(Liquid);
|
||||||
stream.WriteBoolean(Lava);
|
stream.WriteBoolean(Lava);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
stream.WriteInt16(1); // Screw trying to figure out how many tiles are the same
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Unpack(Stream stream)
|
public void Unpack(Stream stream)
|
||||||
|
|
@ -115,6 +121,11 @@ namespace TShockAPI.Net
|
||||||
Liquid = stream.ReadInt8();
|
Liquid = stream.ReadInt8();
|
||||||
Lava = stream.ReadBoolean();
|
Lava = stream.ReadBoolean();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (flags.HasFlag(TileFlags.Wire))
|
||||||
|
Wire = true;
|
||||||
|
|
||||||
|
var samenum = stream.ReadInt16();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -126,5 +137,6 @@ namespace TShockAPI.Net
|
||||||
Lighted = 2,
|
Lighted = 2,
|
||||||
Wall = 4,
|
Wall = 4,
|
||||||
Liquid = 8,
|
Liquid = 8,
|
||||||
|
Wire = 16
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue