1 files changed, 11 insertions, 9 deletions
diff --git a/src/main/java/org/traccar/model/Event.java b/src/main/java/org/traccar/model/Event.java
index 5eee2a0a0..a7a134ecf 100644
--- a/src/main/java/org/traccar/model/Event.java
+++ b/src/main/java/org/traccar/model/Event.java
@@ -19,15 +19,17 @@ import java.util.Date;
 
 public class Event extends Message {
 
-    public Event(String type, long deviceId, long positionId) {
-        this(type, deviceId);
-        setPositionId(positionId);
+    public Event(String type, Position position) {
+        setType(type);
+        setPositionId(position.getId());
+        setDeviceId(position.getDeviceId());
+        eventTime = position.getDeviceTime();
     }
 
     public Event(String type, long deviceId) {
         setType(type);
         setDeviceId(deviceId);
-        this.serverTime = new Date();
+        eventTime = new Date();
     }
 
     public Event() {
@@ -62,14 +64,14 @@ public class Event extends Message {
 
     public static final String TYPE_DRIVER_CHANGED = "driverChanged";
 
-    private Date serverTime;
+    private Date eventTime;
 
-    public Date getServerTime() {
-        return serverTime;
+    public Date getEventTime() {
+        return eventTime;
     }
 
-    public void setServerTime(Date serverTime) {
-        this.serverTime = serverTime;
+    public void setEventTime(Date eventTime) {
+        this.eventTime = eventTime;
     }
 
     private long positionId;