teeworlds 2.4.3 → 2.4.5

package/lib/snapshot.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Snapshot = exports.items = exports.itemAppendix = void 0;
+exports.Snapshot = exports.items = void 0;
 var MsgUnpacker_1 = require("./MsgUnpacker");
 var decoder = new TextDecoder('utf-8');
-exports.itemAppendix = [
+var ___itemAppendix = [
     { "type_id": 0, "size": 0, "name": "obj_ex" },
     { "type_id": 1, "size": 10, "name": "obj_player_input" },
     { "type_id": 2, "size": 6, "name": "obj_projectile" },
@@ -17,14 +17,37 @@ exports.itemAppendix = [
     { "type_id": 10, "size": 5, "name": "obj_player_info" },
     { "type_id": 11, "size": 17, "name": "obj_client_info" },
     { "type_id": 12, "size": 3, "name": "obj_spectator_info" },
-    { "type_id": 13, "size": 2, "name": "event_common" },
-    { "type_id": 14, "size": 2, "name": "event_explosion" },
-    { "type_id": 15, "size": 2, "name": "event_spawn" },
-    { "type_id": 16, "size": 2, "name": "event_hammerhit" },
-    { "type_id": 17, "size": 3, "name": "event_death" },
-    { "type_id": 18, "size": 3, "name": "event_sound_global" },
-    { "type_id": 19, "size": 3, "name": "event_sound_world" },
-    { "type_id": 20, "size": 3, "name": "event_damage_indicator" }
+    { "type_id": 13, "size": 2, "name": "common" },
+    { "type_id": 14, "size": 2, "name": "explosion" },
+    { "type_id": 15, "size": 2, "name": "spawn" },
+    { "type_id": 16, "size": 2, "name": "hammerhit" },
+    { "type_id": 17, "size": 3, "name": "death" },
+    { "type_id": 18, "size": 3, "name": "sound_global" },
+    { "type_id": 19, "size": 3, "name": "sound_world" },
+    { "type_id": 20, "size": 3, "name": "damage_indicator" } // event_damage_indicator
+];
+var itemAppendix = [
+    0,
+    10,
+    6,
+    5,
+    4,
+    3,
+    8,
+    4,
+    15,
+    22,
+    5,
+    17,
+    3,
+    2,
+    2,
+    2,
+    2,
+    3,
+    3,
+    3,
+    3,
 ];
 var items;
 (function (items) {
@@ -51,10 +74,11 @@ var items;
     items[items["EVENT_DAMAGE_INDICATOR"] = 20] = "EVENT_DAMAGE_INDICATOR";
 })(items = exports.items || (exports.items = {}));
 var Snapshot = /** @class */ (function () {
-    function Snapshot() {
+    function Snapshot(_client) {
         this.deltas = [];
         this.eSnapHolder = [];
         this.crc_errors = 0;
+        this.client = _client;
     }
     Snapshot.prototype.IntsToStr = function (pInts) {
         var pIntz = [];
@@ -193,6 +217,7 @@ var Snapshot = /** @class */ (function () {
                     weapon: data[19],
                     emote: data[20],
                     attack_tick: data[21],
+                    client_id: id
                 };
                 break;
             case items.OBJ_PLAYER_INFO:
@@ -292,23 +317,32 @@ var Snapshot = /** @class */ (function () {
         }
         return _item;
     };
-    Snapshot.prototype.crc = function (tick) {
+    Snapshot.prototype.crc = function () {
         var checksum = 0;
-        this.eSnapHolder.forEach(function (snap) {
-            if (snap.ack == tick)
-                snap.Snapshot.Data.forEach(function (el) { return checksum += el; });
+        // this.eSnapHolder.forEach(snap => {
+        // 	if (snap.ack == tick)
+        // 		snap.Snapshot.Data.forEach(el => checksum += el);
+        // })
+        this.deltas.forEach(function (snap) {
+            // if (snap.ack == tick)
+            snap.data.forEach(function (el) { return checksum += el; });
         });
         return checksum & 0xffffffff;
     };
     Snapshot.prototype.unpackSnapshot = function (snap, deltatick, recvTick, WantedCrc) {
         var _this = this;
         var unpacker = new MsgUnpacker_1.MsgUnpacker(snap);
+        var deltaSnaps = [];
         if (deltatick == -1) {
             this.eSnapHolder = [];
             this.deltas = [];
         }
         else {
-            this.eSnapHolder = this.eSnapHolder.filter(function (a) { return a.ack >= deltatick; });
+            this.eSnapHolder = this.eSnapHolder.filter(function (a) {
+                if (a.ack == deltatick)
+                    deltaSnaps.push(a);
+                return a.ack >= deltatick;
+            });
         }
         if (snap.length == 0) {
             // empty snap, copy old one into new ack
@@ -318,12 +352,15 @@ var Snapshot = /** @class */ (function () {
             });
             return { items: [], recvTick: recvTick };
         }
+        var oldDeltas = this.deltas;
+        this.deltas = [];
         /* key = (((type_id) << 16) | (id))
         * key_to_id = ((key) & 0xffff)
         * key_to_type_id = ((key >> 16) & 0xffff)
         * https://github.com/heinrich5991/libtw2/blob/master/snapshot/src/
         * https://github.com/heinrich5991/libtw2/blob/master/doc/snapshot.md
         */
+        var _events = [];
         var num_removed_items = unpacker.unpackInt();
         var num_item_deltas = unpacker.unpackInt();
         unpacker.unpackInt(); // _zero padding
@@ -335,81 +372,106 @@ var Snapshot = /** @class */ (function () {
             [  ] item_deltas
         */
         var deleted = [];
-        var _loop_1 = function (i) {
+        for (var i = 0; i < num_removed_items; i++) {
             var deleted_key = unpacker.unpackInt(); // removed_item_keys
-            // let index = this.deltas.map(delta => delta.key).indexOf(deleted_key);
-            var index = this_1.deltas.findIndex(function (delta) { return delta.key === deleted_key; });
-            if (index > -1)
-                this_1.deltas.splice(index, 1);
             deleted.push(deleted_key);
-        };
-        var this_1 = this;
-        for (var i = 0; i < num_removed_items; i++) {
-            _loop_1(i);
         }
-        if (deleted.length)
-            this.eSnapHolder = this.eSnapHolder.filter(function (a) { return !deleted.includes(a.Snapshot.Key); });
         /*item_delta:
             [ 4] type_id
             [ 4] id
             [ 4] _size
             [*4] data_delta*/
-        var items = { items: [], /* client_infos: client_infos, player_infos: player_infos,*/ lost: 0 };
-        var deltaSnaps = this.eSnapHolder.filter(function (a) { return a.ack === deltatick; });
+        // let items: {'items': {'data': number[], 'type_id': number, 'id': number, 'key': number}[]/*, 'client_infos': client_info[], 'player_infos': player_info[]*/, lost: number} = {items: [],/* client_infos: client_infos, player_infos: player_infos,*/ lost: 0};
+        // let deltaSnaps = this.eSnapHolder.filter(a => a.ack === deltatick);
         if (deltaSnaps.length == 0 && deltatick >= 0) {
             return { items: [], recvTick: -1 };
         }
-        var _loop_2 = function (i) {
+        var _loop_1 = function (i) {
             var type_id = unpacker.unpackInt();
             var id = unpacker.unpackInt();
             var key = (((type_id) << 16) | (id));
             var _size = void 0;
-            if (type_id > 0 && type_id < exports.itemAppendix.length) {
-                _size = exports.itemAppendix[type_id].size;
+            if (type_id > 0 && type_id < itemAppendix.length) {
+                _size = itemAppendix[type_id];
             }
             else
                 _size = unpacker.unpackInt();
             var data = [];
             for (var j = 0; j < _size; j++) {
-                if (unpacker.remaining.length > 0)
-                    data.push(unpacker.unpackInt());
+                // if (unpacker.remaining.length > 0)  {
+                data[j] = (unpacker.unpackInt());
+                // } else console.log(_size, "???")
             }
+            var changed = false;
             if (deltatick >= 0) {
                 // let index = deltaSnaps.map(delta => delta.Snapshot.Key).indexOf(key)
-                var index = deltaSnaps.findIndex(function (delta) { return delta.Snapshot.Key === key; });
-                if (index > -1) {
-                    var out = UndiffItem(deltaSnaps[index].Snapshot.Data, data);
+                var delta = deltaSnaps.find(function (delta) { return delta.Snapshot.Key === key; });
+                if (delta !== undefined) {
+                    var out = UndiffItem(delta.Snapshot.Data, data);
                     data = out;
+                    changed = true;
                 } // else no previous, use new data
             }
-            var parsed = this_2.parseItem(data, type_id, id);
-            this_2.eSnapHolder.push({ Snapshot: { Data: data, Key: key }, ack: recvTick });
-            items.items.push({ data: data, parsed: parsed, type_id: type_id, id: id, key: key });
+            var parsed = void 0;
+            if (!changed) {
+                var oldDelta = oldDeltas.find(function (delta) { return delta.key == key; });
+                if (oldDelta !== undefined && compareArrays(data, oldDelta.data)) {
+                    parsed = oldDelta.parsed;
+                }
+                else
+                    parsed = this_1.parseItem(data, type_id, id);
+            }
+            else
+                parsed = this_1.parseItem(data, type_id, id);
+            this_1.eSnapHolder.push({ Snapshot: { Data: data, Key: key }, ack: recvTick });
+            this_1.deltas.push({
+                data: data,
+                key: key,
+                id: id,
+                type_id: type_id,
+                parsed: parsed
+            });
+            if (type_id >= items.EVENT_COMMON && type_id <= items.EVENT_DAMAGE_INDICATOR) {
+                // this.client.SnapshotUnpacker.
+                _events.push({ type_id: type_id, parsed: parsed });
+                // this.client.SnapshotUnpacker.emit(___itemAppendix[type_id].name, parsed);
+            }
         };
-        var this_2 = this;
+        var this_1 = this;
         for (var i = 0; i < num_item_deltas; i++) {
-            _loop_2(i);
+            _loop_1(i);
         }
-        var _loop_3 = function (newSnap) {
-            if (this_3.eSnapHolder.findIndex(function (a) { return a.ack == recvTick && a.Snapshot.Key == newSnap.Snapshot.Key; }) === -1) { // ugly copy new snap to eSnapHolder (if it isnt pushed already)
-                this_3.eSnapHolder.push({ Snapshot: { Data: newSnap.Snapshot.Data, Key: newSnap.Snapshot.Key }, ack: recvTick });
+        var _loop_2 = function (newSnap) {
+            if (deleted.includes(newSnap.Snapshot.Key)) {
+                return "continue";
             }
-            if (deltatick > -1) {
-                var ____index = this_3.deltas.findIndex(function (delta) { return delta.key == newSnap.Snapshot.Key; });
-                if (____index > -1) {
-                    this_3.deltas[____index] = { data: newSnap.Snapshot.Data, key: newSnap.Snapshot.Key, id: newSnap.Snapshot.Key & 0xffff, type_id: ((newSnap.Snapshot.Key >> 16) & 0xffff), parsed: this_3.parseItem(newSnap.Snapshot.Data, ((newSnap.Snapshot.Key >> 16) & 0xffff), ((newSnap.Snapshot.Key) & 0xffff)) };
-                    return "continue";
+            if (this_2.eSnapHolder.findIndex(function (a) { return a.ack == recvTick && a.Snapshot.Key == newSnap.Snapshot.Key; }) === -1) { // ugly copy new snap to eSnapHolder (if it isnt pushed already)
+                this_2.eSnapHolder.push({ Snapshot: { Data: newSnap.Snapshot.Data, Key: newSnap.Snapshot.Key }, ack: recvTick });
+                var oldDelta = oldDeltas.find(function (delta) { return delta.key == newSnap.Snapshot.Key; });
+                if (oldDelta !== undefined && compareArrays(newSnap.Snapshot.Data, oldDelta.data)) {
+                    this_2.deltas.push(oldDelta);
                 }
-            } // else
-            this_3.deltas.push({ data: newSnap.Snapshot.Data, key: newSnap.Snapshot.Key, id: newSnap.Snapshot.Key & 0xffff, type_id: ((newSnap.Snapshot.Key >> 16) & 0xffff), parsed: this_3.parseItem(newSnap.Snapshot.Data, ((newSnap.Snapshot.Key >> 16) & 0xffff), ((newSnap.Snapshot.Key) & 0xffff)) });
+                else {
+                    this_2.deltas.push({
+                        data: newSnap.Snapshot.Data,
+                        key: newSnap.Snapshot.Key,
+                        id: newSnap.Snapshot.Key & 0xffff,
+                        type_id: ((newSnap.Snapshot.Key >> 16) & 0xffff),
+                        parsed: this_2.parseItem(newSnap.Snapshot.Data, ((newSnap.Snapshot.Key >> 16) & 0xffff), ((newSnap.Snapshot.Key) & 0xffff))
+                    });
+                }
+            }
         };
-        var this_3 = this;
+        var this_2 = this;
         for (var _i = 0, deltaSnaps_1 = deltaSnaps; _i < deltaSnaps_1.length; _i++) {
             var newSnap = deltaSnaps_1[_i];
-            _loop_3(newSnap);
+            _loop_2(newSnap);
         }
-        if (this.crc(recvTick) !== WantedCrc) {
+        var _crc = this.crc();
+        if (_crc !== WantedCrc) {
+            this.deltas = oldDeltas;
             this.crc_errors++;
+            console.log("crc error", _crc, WantedCrc, this.crc_errors);
             if (this.crc_errors > 5) {
                 recvTick = -1;
                 this.crc_errors = 0;
@@ -422,11 +484,21 @@ var Snapshot = /** @class */ (function () {
         }
         else if (this.crc_errors > 0)
             this.crc_errors--;
-        return { items: items, recvTick: recvTick };
+        _events.forEach(function (a) { return _this.client.SnapshotUnpacker.emit(___itemAppendix[a.type_id].name, a.parsed); });
+        return { items: this.deltas, recvTick: recvTick };
     };
     return Snapshot;
 }());
 exports.Snapshot = Snapshot;
+function compareArrays(first, second) {
+    if (first.length !== second.length)
+        return false;
+    for (var i = 0; i < first.length; i++) {
+        if (first[i] !== second[i])
+            return false;
+    }
+    return true;
+}
 function UndiffItem(oldItem, newItem) {
     var out = newItem;
     // if (JSON.stringify(newItem) === JSON.stringify(oldItem))
@@ -436,6 +508,7 @@ function UndiffItem(oldItem, newItem) {
             out[i] += a;
         }
         else {
+            console.log("UNDEFINED UNDEFINED UNDEFINED");
             out[i] = 0;
         }
     });

package/lib/snapshot.ts

@@ -1,7 +1,9 @@
+import { Client } from "./client";
 import { MsgUnpacker } from "./MsgUnpacker";
+import { PlayerInput, PlayerInfo, Projectile, Laser, Pickup, Flag, GameInfo, GameData, CharacterCore, Character, ClientInfo, SpectatorInfo, Common, Explosion, Spawn, HammerHit, Death, SoundGlobal, SoundWorld, DamageInd } from "./snapshots";
 var decoder = new TextDecoder('utf-8');
 
-export const itemAppendix: {"type_id": number, "size": number, "name": string}[] = [
+const ___itemAppendix: {"type_id": number, "size": number, "name": string}[] = [ // only used for the events underneath. the actual itemAppendix below this is only used for size
 	{"type_id": 0, "size": 0, "name": "obj_ex"},
 	{"type_id": 1, "size": 10, "name": "obj_player_input"},
 	{"type_id": 2, "size": 6, "name": "obj_projectile"},
@@ -15,14 +17,37 @@ export const itemAppendix: {"type_id": number, "size": number, "name": string}[]
 	{"type_id": 10, "size": 5, "name": "obj_player_info"},
 	{"type_id": 11, "size": 17, "name": "obj_client_info"},
 	{"type_id": 12, "size": 3, "name": "obj_spectator_info"},
-	{"type_id": 13, "size": 2, "name": "event_common"},
-	{"type_id": 14, "size": 2, "name": "event_explosion"},
-	{"type_id": 15, "size": 2, "name": "event_spawn"},
-	{"type_id": 16, "size": 2, "name": "event_hammerhit"},
-	{"type_id": 17, "size": 3, "name": "event_death"},
-	{"type_id": 18, "size": 3, "name": "event_sound_global"},
-	{"type_id": 19, "size": 3, "name": "event_sound_world"},
-	{"type_id": 20, "size": 3, "name": "event_damage_indicator"}
+	{"type_id": 13, "size": 2, "name": "common"}, // event_common
+	{"type_id": 14, "size": 2, "name": "explosion"}, // event_explosion
+	{"type_id": 15, "size": 2, "name": "spawn"}, // event_spawn
+	{"type_id": 16, "size": 2, "name": "hammerhit"}, // event_hammerhit
+	{"type_id": 17, "size": 3, "name": "death"}, // event_death
+	{"type_id": 18, "size": 3, "name": "sound_global"}, // event_sound_global
+	{"type_id": 19, "size": 3, "name": "sound_world"}, // event_sound_world
+	{"type_id": 20, "size": 3, "name": "damage_indicator"} // event_damage_indicator
+]
+const itemAppendix: number[] = [
+	0,
+	10,
+	6,
+	5,
+	4,
+	3,
+	8,
+	4,
+	15,
+	22,
+	5,
+	17,
+	3,
+	2,
+	2,
+	2,
+	2,
+	3,
+	3,
+	3,
+	3,
 ]
 
 export enum items {
@@ -49,7 +74,7 @@ export enum items {
 	EVENT_DAMAGE_INDICATOR
 }
 
-export type Item = PlayerInput | PlayerInfo | Projectile | Laser | Pickup | Flag | GameInfo | GameData | CharacterCore | Character | PlayerInfo | ClientInfo | SpectatorInfo | Common | Explosion | Spawn |HammerHit | Death | SoundGlobal | SoundWorld | DamageInd | DdnetCharacter;
+export declare type Item = PlayerInput | PlayerInfo | Projectile | Laser | Pickup | Flag | GameInfo | GameData | CharacterCore | Character | PlayerInfo | ClientInfo | SpectatorInfo | Common | Explosion | Spawn |HammerHit | Death | SoundGlobal | SoundWorld | DamageInd;
 interface eSnap {
 	Snapshot: {Key: number, Data: number[]},
 	ack: number,
@@ -58,7 +83,12 @@ export class Snapshot {
 	deltas: {'data': number[], 'parsed': Item, 'type_id': number, 'id': number, 'key': number}[] = [];
 	eSnapHolder: eSnap[] = [];
 	crc_errors: number = 0;
+	client: Client;
 
+	constructor(_client: Client) {
+		this.client = _client;
+	}
+	
 	private IntsToStr(pInts: number[]): string {
 		var pIntz: number[] = [];
 		// var pStr = ''
@@ -197,6 +227,8 @@ export class Snapshot {
 					weapon: data[19],
 					emote: data[20],
 					attack_tick: data[21],
+
+					client_id: id
 				} as Character
 				break;
 			case items.OBJ_PLAYER_INFO:
@@ -299,40 +331,51 @@ export class Snapshot {
 		return _item;
 	}
 
-	crc(tick: number) {
+	crc() {
 		var checksum = 0;
-		this.eSnapHolder.forEach(snap => {
-			if (snap.ack == tick)
-				snap.Snapshot.Data.forEach(el => checksum += el);
+		// this.eSnapHolder.forEach(snap => {
+		// 	if (snap.ack == tick)
+		// 		snap.Snapshot.Data.forEach(el => checksum += el);
+		// })
+		this.deltas.forEach(snap => {
+			// if (snap.ack == tick)
+				snap.data.forEach(el => checksum += el);
 		})
 
 		return checksum & 0xffffffff;
 	}
-
-	unpackSnapshot(snap: number[], deltatick: number, recvTick: number, WantedCrc: number) { 
+	unpackSnapshot(snap: Buffer, deltatick: number, recvTick: number, WantedCrc: number) { 
 		let unpacker = new MsgUnpacker(snap);
+		let deltaSnaps: eSnap[] = [];
 		if (deltatick == -1) {
 			this.eSnapHolder = [];
 			this.deltas = [];
 		} else {
-			this.eSnapHolder = this.eSnapHolder.filter(a => a.ack >= deltatick)
+			this.eSnapHolder = this.eSnapHolder.filter(a => {
+				if (a.ack == deltatick)
+					deltaSnaps.push(a);
+				return a.ack >= deltatick
+			})
 		}
 		if (snap.length == 0) {
 			// empty snap, copy old one into new ack
 			this.eSnapHolder.forEach(snap => {
-				if (snap.ack == deltatick)
+				if (snap.ack == deltatick) 
 					this.eSnapHolder.push({Snapshot: snap.Snapshot, ack: recvTick});
 
 			})
 			return {items: [], recvTick: recvTick};
 		}
+		let oldDeltas = this.deltas;
+		this.deltas = [];
 		/* key = (((type_id) << 16) | (id))
 		* key_to_id = ((key) & 0xffff)
 		* key_to_type_id = ((key >> 16) & 0xffff) 
 		* https://github.com/heinrich5991/libtw2/blob/master/snapshot/src/
 		* https://github.com/heinrich5991/libtw2/blob/master/doc/snapshot.md
 		*/ 
-	
+		var _events: {type_id: number, parsed: Item}[] = [];
+		
 		let num_removed_items = unpacker.unpackInt();
 		let num_item_deltas = unpacker.unpackInt();
 		unpacker.unpackInt(); // _zero padding
@@ -347,23 +390,17 @@ export class Snapshot {
 		var deleted: number[] = [];
 		for (let i = 0; i < num_removed_items; i++) {
 			let deleted_key = unpacker.unpackInt(); // removed_item_keys
-			// let index = this.deltas.map(delta => delta.key).indexOf(deleted_key);
-			let index = this.deltas.findIndex(delta => delta.key === deleted_key);
-			if (index > -1)
-				this.deltas.splice(index, 1);
 			deleted.push(deleted_key)
 		}
-		if (deleted.length) 
-			this.eSnapHolder = this.eSnapHolder.filter(a => !deleted.includes(a.Snapshot.Key));
-		
 		/*item_delta:
 			[ 4] type_id
 			[ 4] id
 			[ 4] _size
 			[*4] data_delta*/
 
-		let items: {'items': {'data': number[], 'parsed': Item, 'type_id': number, 'id': number, 'key': number}[]/*, 'client_infos': client_info[], 'player_infos': player_info[]*/, lost: number} = {items: [],/* client_infos: client_infos, player_infos: player_infos,*/ lost: 0};
-		let deltaSnaps = this.eSnapHolder.filter(a => a.ack === deltatick);
+		// let items: {'items': {'data': number[], 'type_id': number, 'id': number, 'key': number}[]/*, 'client_infos': client_info[], 'player_infos': player_info[]*/, lost: number} = {items: [],/* client_infos: client_infos, player_infos: player_infos,*/ lost: 0};
+		
+		// let deltaSnaps = this.eSnapHolder.filter(a => a.ack === deltatick);
 
 		if (deltaSnaps.length == 0 && deltatick >= 0) {
 			return {items: [], recvTick: -1};
@@ -377,50 +414,87 @@ export class Snapshot {
 
 			let _size;
 			if (type_id > 0 && type_id < itemAppendix.length) {
-				_size = itemAppendix[type_id].size;
+				_size = itemAppendix[type_id];
 			} else
 				_size = unpacker.unpackInt();
 
 			let data: number[] = [];
 			for (let j = 0; j < _size; j++) {
-				if (unpacker.remaining.length > 0) 
-					data.push(unpacker.unpackInt());
+				// if (unpacker.remaining.length > 0)  {
+					data[j] = (unpacker.unpackInt());
+				// } else console.log(_size, "???")
 			}
+			let changed = false;
 			if (deltatick >= 0) { 
 				// let index = deltaSnaps.map(delta => delta.Snapshot.Key).indexOf(key)
-				let index = deltaSnaps.findIndex(delta => delta.Snapshot.Key === key);
-				if (index > -1) {
-				
-					let out = UndiffItem(deltaSnaps[index].Snapshot.Data, data)
+				let delta = deltaSnaps.find(delta => delta.Snapshot.Key === key);
+				if (delta !== undefined) {
+					let out = UndiffItem(delta.Snapshot.Data, data)
 					data = out;
+					changed = true;
 				} // else no previous, use new data
 			} 
+			let parsed: Item;
+			if (!changed) {
+				let oldDelta = oldDeltas.find(delta => delta.key == key); 
+				if (oldDelta !== undefined && compareArrays(data, oldDelta.data)) {
+					parsed = oldDelta.parsed;
 
-			let parsed = this.parseItem(data, type_id, id)
+				} else 
+					parsed = this.parseItem(data, type_id, id)
+					
+			} else 
+				parsed = this.parseItem(data, type_id, id)
+			
 			this.eSnapHolder.push({Snapshot: {Data: data, Key: key}, ack: recvTick});
 
-			items.items.push({data, parsed, type_id, id, key})
+			this.deltas.push({
+				data, 
+				key, 
+				id, 
+				type_id, 
+				parsed
+			});
+		
+			if (type_id >= items.EVENT_COMMON && type_id <= items.EVENT_DAMAGE_INDICATOR) {
+				// this.client.SnapshotUnpacker.
+				
+				_events.push({type_id, parsed});
+				// this.client.SnapshotUnpacker.emit(___itemAppendix[type_id].name, parsed);
+			}
 
 
 
 		}
+		
 		for (let newSnap of deltaSnaps) {
+			if (deleted.includes(newSnap.Snapshot.Key)) {
+				continue;
+			}
 			if (this.eSnapHolder.findIndex(a => a.ack == recvTick && a.Snapshot.Key == newSnap.Snapshot.Key) === -1) { // ugly copy new snap to eSnapHolder (if it isnt pushed already)
 				this.eSnapHolder.push({Snapshot: {Data: newSnap.Snapshot.Data, Key: newSnap.Snapshot.Key}, ack: recvTick});
+				let oldDelta = oldDeltas.find(delta => delta.key == newSnap.Snapshot.Key); 
+				if (oldDelta !== undefined && compareArrays(newSnap.Snapshot.Data, oldDelta.data)) {
+					this.deltas.push(oldDelta);
+
+				} else {
+					this.deltas.push({
+						data: newSnap.Snapshot.Data, 
+						key: newSnap.Snapshot.Key, 
+						id: newSnap.Snapshot.Key & 0xffff, 
+						type_id: ((newSnap.Snapshot.Key >> 16) & 0xffff), 
+						parsed: this.parseItem(newSnap.Snapshot.Data, ((newSnap.Snapshot.Key >> 16) & 0xffff), ((newSnap.Snapshot.Key) & 0xffff))
+					});
+
+				}
 			}
-			if (deltatick > -1) {
-				let ____index = this.deltas.findIndex(delta => delta.key == newSnap.Snapshot.Key)
-				
-				if (____index > -1) {
-					this.deltas[____index] = {data: newSnap.Snapshot.Data, key: newSnap.Snapshot.Key, id: newSnap.Snapshot.Key & 0xffff, type_id: ((newSnap.Snapshot.Key >> 16) & 0xffff), parsed: this.parseItem(newSnap.Snapshot.Data, ((newSnap.Snapshot.Key >> 16) & 0xffff), ((newSnap.Snapshot.Key) & 0xffff))};
-					continue;
-				} 
-			} // else
-			this.deltas.push({data: newSnap.Snapshot.Data, key: newSnap.Snapshot.Key, id: newSnap.Snapshot.Key & 0xffff, type_id: ((newSnap.Snapshot.Key >> 16) & 0xffff), parsed: this.parseItem(newSnap.Snapshot.Data, ((newSnap.Snapshot.Key >> 16) & 0xffff), ((newSnap.Snapshot.Key) & 0xffff))});
 		}
-		
-		if (this.crc(recvTick) !== WantedCrc) {
+
+		let _crc = this.crc();
+		if (_crc !== WantedCrc) {
+			this.deltas = oldDeltas;
 			this.crc_errors++;
+			console.log("crc error", _crc, WantedCrc, this.crc_errors)
 			if (this.crc_errors > 5) {
 				recvTick = -1;
 				this.crc_errors = 0;
@@ -432,9 +506,18 @@ export class Snapshot {
 			}
 		} else if (this.crc_errors > 0)
 			this.crc_errors--;
-		
-		return {items, recvTick};
+		_events.forEach(a => this.client.SnapshotUnpacker.emit(___itemAppendix[a.type_id].name, a.parsed))
+		return {items: this.deltas, recvTick};
+	}
+}
+function compareArrays(first: number[], second: number[]) {
+	if (first.length !== second.length)
+		return false;
+	for (var i = 0; i < first.length; i++) {
+		if (first[i] !== second[i])
+			return false;
 	}
+	return true;
 }
 
 function UndiffItem(oldItem: number[], newItem: number[]): number[] {
@@ -445,6 +528,7 @@ function UndiffItem(oldItem: number[], newItem: number[]): number[] {
 		if (a !== undefined && out[i] !== undefined) {
 			out[i] += a;
 		} else {
+			console.log("UNDEFINED UNDEFINED UNDEFINED")
 			out[i] = 0;
 		}
 	})