Fix JSON marshalling

Author: StefanDorresteijn

pkg/demoinfocs/common/common.go

@@ -131,7 +131,7 @@ type TeamState struct {
 	Entity st.Entity
 
 	// Terrorist TeamState for CTs, CT TeamState for Terrorists
-	Opponent *TeamState
+	Opponent *TeamState `json:"-"`
 }
 
 // Team returns the team for which the TeamState contains data.

pkg/demoinfocs/common/equipment.go

@@ -312,8 +312,8 @@ const (
 // This also includes the skin and some additional data.
 type Equipment struct {
 	Type   EquipmentType // The type of weapon which the equipment instantiates.
-	Entity st.Entity     // The game entity instance
-	Owner  *Player       // The player carrying the equipment, not necessarily the buyer.
+	Entity st.Entity     `json:"-"` // The game entity instance
+	Owner  *Player       `json:"-"` // The player carrying the equipment, not necessarily the buyer.
 	// E.g. 'models/weapons/w_rif_m4a1_s.mdl'.
 	// Used internally to differentiate alternative weapons (M4A4 / M4A1-S etc.) for Source 1 demos.
 	// It's always an empty string with Source 2 demos, you should use Type to know which weapon it is.

pkg/demoinfocs/sendtables2/entity.go

@@ -28,6 +28,9 @@ type Entity struct {
 	propCache        map[string]st.Property
 }
 
+// func (*Entity) GobDecode([]byte) error    { return nil }
+// func (Entity) GobEncode() ([]byte, error) { return nil, nil }
+
 func (e *Entity) ServerClass() st.ServerClass {
 	return e.class
 }