From cf01d47796bf0112c46349ec1fda8b9279dc4936 Mon Sep 17 00:00:00 2001
From: NathanSweet <nathan.sweet@gmail.com>
Date: Thu, 21 Jan 2016 11:37:19 +0100
Subject: [PATCH] Updated Event in anticipation of AnimationState changes.

---
 .../com/esotericsoftware/spine/EventTimelineTests.java    | 4 ++--
 .../src/com/esotericsoftware/spine/Animation.java         | 4 ++--
 .../src/com/esotericsoftware/spine/Event.java             | 8 +++++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/EventTimelineTests.java b/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/EventTimelineTests.java
index 96703da54..9c146485e 100644
--- a/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/EventTimelineTests.java
+++ b/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/EventTimelineTests.java
@@ -92,8 +92,8 @@ public class EventTimelineTests {
 		float lastFrame = -1;
 		for (int i = 0; i < eventCount; i++) {
 			float frame = frames[i];
-			Event event = new Event(new EventData("" + events[i]));
-			timeline.setFrame(i, frame, event);
+			Event event = new Event(frame, new EventData("" + events[i]));
+			timeline.setFrame(i, event);
 			maxFrame = Math.max(maxFrame, frame);
 			if (lastFrame != frame) distinctCount++;
 			lastFrame = frame;
diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java
index 8ea375a27..59c77c6e7 100644
--- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java
+++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java
@@ -543,8 +543,8 @@ public class Animation {
 		}
 
 		/** Sets the time of the specified keyframe. */
-		public void setFrame (int frameIndex, float time, Event event) {
-			frames[frameIndex] = time;
+		public void setFrame (int frameIndex, Event event) {
+			frames[frameIndex] = event.time;
 			events[frameIndex] = event;
 		}
 
diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Event.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Event.java
index 8f0061f05..dcf57551e 100644
--- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Event.java
+++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Event.java
@@ -36,8 +36,10 @@ public class Event {
 	int intValue;
 	float floatValue;
 	String stringValue;
+	final float time;
 
-	public Event (EventData data) {
+	public Event (float time, EventData data) {
+		this.time = time;
 		this.data = data;
 	}
 
@@ -65,6 +67,10 @@ public class Event {
 		this.stringValue = stringValue;
 	}
 
+	public float getTime () {
+		return time;
+	}
+
 	public EventData getData () {
 		return data;
 	}