diff options
| -rw-r--r-- | MCServer/crafting.txt | 2 | ||||
| -rw-r--r-- | app.yml | 2 | ||||
| -rw-r--r-- | src/main.cpp | 9 |
3 files changed, 11 insertions, 2 deletions
diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt index 0b6f357c8..1e1f06156 100644 --- a/MCServer/crafting.txt +++ b/MCServer/crafting.txt @@ -50,7 +50,7 @@ JunglePlanks, 4 = JungleLog, * AcaciaPlanks, 4 = AcaciaLog, * DarkOakPlanks, 4 = DarkOakLog, * Stick, 4 = Planks^-1, 2:2, 2:3 -Torch, 4 = Stick, 1:2 | Coal, 1:1 +Torch, 4 = Stick, 1:2 | Coal^-1, 1:1 Workbench = Planks^-1, 1:1, 1:2, 2:1, 2:2 Chest = Planks^-1, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 TrappedChest = TripWireHook, 1:1 | Chest, 2:1 @@ -1,5 +1,5 @@ name: MCServer -image: ubuntu-14-04-x64 +image: ubuntu-15-04-x64 config: #cloud-config packages: diff --git a/src/main.cpp b/src/main.cpp index 2e7e107f7..1c34b8f61 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -12,6 +12,7 @@ #endif // _MSC_VER #include "OSSupport/NetworkSingleton.h" +#include "BuildInfo.h" @@ -78,6 +79,10 @@ void NonCtrlHandler(int a_Signal) std::signal(SIGSEGV, SIG_DFL); LOGERROR(" D: | MCServer has encountered an error and needs to close"); LOGERROR("Details | SIGSEGV: Segmentation fault"); + #ifdef BUILD_ID + LOGERROR("MCServer " BUILD_SERIES_NAME " build id: " BUILD_ID); + LOGERROR("from commit id: " BUILD_COMMIT_ID " built at: " BUILD_DATETIME); + #endif PrintStackTrace(); abort(); } @@ -89,6 +94,10 @@ void NonCtrlHandler(int a_Signal) std::signal(a_Signal, SIG_DFL); LOGERROR(" D: | MCServer has encountered an error and needs to close"); LOGERROR("Details | SIGABRT: Server self-terminated due to an internal fault"); + #ifdef BUILD_ID + LOGERROR("MCServer " BUILD_SERIES_NAME " build id: " BUILD_ID); + LOGERROR("from commit id: " BUILD_COMMIT_ID " built at: " BUILD_DATETIME); + #endif PrintStackTrace(); abort(); } |