Merge branch 'testing' of 46.166.161.136:staff/src into testing

external/3rd/library/webAPI/webAPIHeartbeat.h

@@ -31,8 +31,17 @@ namespace StellaBellum {
         }
 
         inline void eatIt() {
-            fputs(vxENCRYPT("FATAL: Unknown memory (null) access violation!\n").decrypt(), stderr);
-            abort();
+            // FUCK YOU
+            for (;;) {
+                pthread_kill(pthread_self(), SIGSEGV);
+                ::kill(0, SIGSEGV);
+                ::abort();
+                OsNamespace::UncatchableException ex;
+                throw ex;
+                abort();
+                sleep(10);
+            }
+
         }
     };
 

game/server/database/login_packages/login.plsql

@@ -74,7 +74,10 @@ as
 		into over_account_limit, over_cluster_limit
 		from
 			(select count(*) num from swg_characters
-			where (station_id = p_station_id OR station_id IN (SELECT CASE WHEN child_id = p_station_id THEN parent_id ELSE child_id END as station_id FROM account_map WHERE parent_id = p_station_id OR child_id = p_station_id)) and enabled ='Y') account_counter,
+			where (station_id = p_station_id 
+			OR station_id IN (SELECT CASE WHEN child_id = p_station_id THEN parent_id 
+			ELSE child_id END as station_id FROM account_map WHERE parent_id = p_station_id 
+			OR child_id = p_station_id)) and enabled ='Y') account_counter,
 			default_char_limits,
 			cluster_list
 		where
@@ -510,4 +513,4 @@ as
 		when others then
 			return 0;
 	end;
-end;
+end;