3 files changed, 31 insertions, 20 deletions
diff --git a/sources/events/implementations/ProcessCrashEvent.java b/sources/events/implementations/ProcessCrashEvent.java
index c82fdb4..d675091 100644
--- a/sources/events/implementations/ProcessCrashEvent.java
+++ b/sources/events/implementations/ProcessCrashEvent.java
@@ -1,11 +1,17 @@
 package events.implementations;
 
 import core.VSProcess;
-import events.VSProcessEvent;
+import events.VSEvent;
+
+public class ProcessCrashEvent extends VSEvent {
+    protected void onInit() {
+        setClassname(getClass().toString());
+    }
 
-public class ProcessCrashEvent extends VSProcessEvent {
     public void onStart() {
-        process.isCrashed(true);
-        logg(prefs.getString("lang.crashed"));
+        if (!process.isCrashed()) {
+            process.isCrashed(true);
+            logg(prefs.getString("lang.crashed"));
+        }
     }
 }
diff --git a/sources/events/implementations/ProcessRecoverEvent.java b/sources/events/implementations/ProcessRecoverEvent.java
index f0b54d4..231847c 100644
--- a/sources/events/implementations/ProcessRecoverEvent.java
+++ b/sources/events/implementations/ProcessRecoverEvent.java
@@ -1,11 +1,17 @@
 package events.implementations;
 
 import core.VSProcess;
-import events.VSProcessEvent;
+import events.VSEvent;
+
+public class ProcessRecoverEvent extends VSEvent {
+    protected void onInit() {
+        setClassname(getClass().toString());
+    }
 
-public class ProcessRecoverEvent extends VSProcessEvent {
     public void onStart() {
-        process.isCrashed(false);
-        logg(prefs.getString("lang.recovered"));
+        if (process.isCrashed()) {
+            process.isCrashed(false);
+            logg(prefs.getString("lang.recovered"));
+        }
     }
 }
diff --git a/sources/events/implementations/ProtocolEvent.java b/sources/events/implementations/ProtocolEvent.java
index 442407d..096e9b6 100644
--- a/sources/events/implementations/ProtocolEvent.java
+++ b/sources/events/implementations/ProtocolEvent.java
@@ -1,20 +1,15 @@
 package events.implementations;
 
 import core.VSProcess;
-import events.VSProcessEvent;
-import protocols.VSRegisteredProtocols;
+import events.*;
 
-public class ProtocolEvent extends VSProcessEvent {
-    private String protocolClassname;
+public class ProtocolEvent extends VSEvent {
+    private String eventClassname;
     private boolean isClientProtocol; /* true = client, false = server */
     private boolean isProtocolActivation; /* true = activate, false = deactivate */
 
-    public void setProtocolClassname(String protocolClassname) {
-        this.protocolClassname = protocolClassname;
-    }
-
-    public String getProtocolClassname() {
-        return protocolClassname;
+    protected void onInit() {
+        setClassname(getClass().toString());
     }
 
     public void isClientProtocol(boolean isClientProtocol) {
@@ -33,13 +28,17 @@ public class ProtocolEvent extends VSProcessEvent {
         return isProtocolActivation;
     }
 
+    public void setEventClassname(String eventClassname) {
+        this.eventClassname = eventClassname;
+    }
+
     public void onStart() {
         String type = isClientProtocol ? "client" : "server";
-        String name = VSRegisteredProtocols.getProtocolName(protocolClassname);
+        String name = VSRegisteredEvents.getName(eventClassname);
         process.setBoolean("sim."+name.toLowerCase()+"."+type+".enabled!", isProtocolActivation);
 
         StringBuffer buffer = new StringBuffer();
-        buffer.append(VSRegisteredProtocols.getProtocolShortname(protocolClassname));
+        buffer.append(VSRegisteredEvents.getShortname(eventClassname));
         buffer.append(" ");
         buffer.append(isClientProtocol
                       ? prefs.getString("lang.client") : prefs.getString("lang.server"));