Exceptions vereinheitlicht

1 files changed, 8 insertions, 2 deletions

diff --git a/src/Net/Packets/ErrorPacket.h b/src/Net/Packets/ErrorPacket.h
index 4c6a026..01c1303 100644
--- a/src/Net/Packets/ErrorPacket.h
+++ b/src/Net/Packets/ErrorPacket.h
@@ -33,6 +33,7 @@ class ErrorPacket : public Packet {
       uint32_t errorCode;
       uint32_t subCode;
       uint32_t subSubCode;
+      uint8_t where[0];
     };
 
     ErrorData *errorData;
@@ -41,7 +42,9 @@ class ErrorPacket : public Packet {
     ErrorPacket(Type type, uint16_t requestId, const Common::Exception &exception);
 
     ErrorPacket(const Packet &p) : Packet(p) {
-      setLength(sizeof(ErrorData));
+      if(getLength() < sizeof(ErrorData))
+        setLength(sizeof(ErrorData));
+
       errorData = (ErrorData*)&rawData->data;
     }
 
@@ -56,7 +59,10 @@ class ErrorPacket : public Packet {
     }
 
     Common::Exception getException() const {
-      return Common::Exception((Common::Exception::ErrorCode)ntohl(errorData->errorCode), ntohl(errorData->subCode), ntohl(errorData->subSubCode));
+      return Common::Exception(
+          std::string((char*)errorData->where, getLength()-sizeof(ErrorData)), (Common::Exception::ErrorCode)ntohl(errorData->errorCode),
+          ntohl(errorData->subCode), ntohl(errorData->subSubCode)
+      );
     }
 };