Use a try .. after construct for handling disconnects.

src/egs_char_select.erl

@@ -82,7 +82,6 @@ event({char_select_enter, Slot, _BackToPreviousField}, Client=#client{gid=GID})
 	User = #users{gid=GID, pid=self(), uni=UniID, slot=Slot, name=Name, race=Race, gender=Gender,
 		class=Class, appearance=Appearance, options=Options, area={1100000, 0, 4}, entryid=0},
 	egs_users:write(User),
-	egs_game_server:link_exit(),
 	egs_users:item_add(GID, 16#11010000, #psu_special_item_variables{}),
 	egs_users:item_add(GID, 16#11020000, #psu_special_item_variables{}),
 	egs_users:item_add(GID, 16#11020100, #psu_special_item_variables{}),

src/egs_exit_mon.erl

@@ -1,50 +0,0 @@
-%% @author Loïc Hoguin <essen@dev-extend.eu>
-%% @copyright 2010-2011 Loïc Hoguin.
-%% @doc General purpose module for monitoring exit signals of linked processes.
-%%
-%%	This file is part of EGS.
-%%
-%%	EGS is free software: you can redistribute it and/or modify
-%%	it under the terms of the GNU Affero General Public License as
-%%	published by the Free Software Foundation, either version 3 of the
-%%	License, or (at your option) any later version.
-%%
-%%	EGS is distributed in the hope that it will be useful,
-%%	but WITHOUT ANY WARRANTY; without even the implied warranty of
-%%	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%%	GNU Affero General Public License for more details.
-%%
-%%	You should have received a copy of the GNU Affero General Public License
-%%	along with EGS.  If not, see <http://www.gnu.org/licenses/>.
-
--module(egs_exit_mon).
--export([start_link/1]). %% API.
--export([start/1, loop/1]). %% Internal.
-
-%% @spec start_link(CleanupFn) -> {ok,Pid::pid()}
-%% @doc Start the monitor and return the process' Pid.
-start_link(CallbackFn) ->
-	Pid = spawn(?MODULE, start, [CallbackFn]),
-	{ok, Pid}.
-
-%% @spec start(CallbackFn) -> ok
-%% @doc Start the main loop.
-start(CallbackFn) ->
-	error_logger:info_report(io_lib:format("egs_exit_mon started with callback ~p", [CallbackFn])),
-	process_flag(trap_exit, true),
-	?MODULE:loop(CallbackFn).
-
-%% @spec loop(CallbackFn) -> ok
-%% @doc Main loop, trap exit messages and call the callback function.
-loop(CallbackFn = {Module, Function}) ->
-	receive
-		{'EXIT', Pid, _} ->
-			spawn(Module, Function, [Pid]);
-		{link, Pid} ->
-			link(Pid);
-		_ ->
-			reload
-	after 5000 ->
-		reload
-	end,
-	?MODULE:loop(CallbackFn).

src/egs_game_protocol.erl

@@ -18,47 +18,48 @@
 %%	along with EGS.  If not, see <http://www.gnu.org/licenses/>.
 
 -module(egs_game_protocol).
--export([start_link/3, init/2, link_exit/0, on_exit/1]).
+-export([start_link/3, init/2]).
 
 -include("include/types.hrl").
 -include("include/records.hrl").
 
 -spec start_link(ssl:sslsocket(), module(), []) -> {ok, pid()}.
 start_link(Socket, Transport, []) ->
-	%% @todo Booh this is ugly. Needs supervision!
-	{ok, MPid} = egs_exit_mon:start_link({?MODULE, on_exit}),
-	register(egs_game_server_exit_mon, MPid),
-	LPid = spawn_link(?MODULE, init, [Socket, Transport]),
-	{ok, LPid}.
+	Pid = spawn_link(?MODULE, init, [Socket, Transport]),
+	{ok, Pid}.
 
--spec init(ssl:sslsocket(), module()) -> ok | closed.
+-spec init(ssl:sslsocket(), module()) -> ok.
 %% @todo Handle keepalive messages globally?
 init(Socket, Transport) ->
-	timer:send_interval(5000, {egs, keepalive}),
+	{ok, _TRef} = timer:send_interval(5000, {egs, keepalive}),
 	Client = #client{socket=Socket, transport=Transport,
 		gid=egs_accounts:tmp_gid()},
 	egs_proto:send_0202(Client),
-	egs_network:recv(<<>>, egs_login, Client).
+	try
+		egs_network:recv(<<>>, egs_login, Client)
+	after
+		terminate()
+	end.
 
-%% @doc Link the on_exit handler to the current process.
-link_exit() ->
-	egs_game_server_exit_mon ! {link, self()}.
-
-%% @spec on_exit(Pid) -> ok
-%% @doc Cleanup the data associated with the failing process.
+-spec terminate() -> ok.
 %% @todo Cleanup the instance process if there's nobody in it anymore.
 %% @todo Leave party instead of stopping it.
-on_exit(Pid) ->
-	User = egs_users:find_by_pid(Pid),
-	case User#users.partypid of
-		undefined ->
-			ignore;
-		PartyPid ->
-			{ok, NPCList} = psu_party:get_npc(PartyPid),
-			[egs_users:delete(NPCGID) || {_Spot, NPCGID} <- NPCList],
-			psu_party:stop(PartyPid)
-	end,
-	egs_zones:leave(User#users.zonepid, User#users.gid),
-	egs_universes:leave(User#users.uni),
-	egs_users:delete(User#users.gid),
-	io:format("game (~p): quit~n", [User#users.gid]).
+%% @todo Fix the crash when user isn't in egs_users yet.
+terminate() ->
+	case egs_users:find_by_pid(self()) of
+		undefined -> ok;
+		User ->
+			case User#users.partypid of
+				undefined ->
+					ignore;
+				PartyPid ->
+					{ok, NPCList} = psu_party:get_npc(PartyPid),
+					lists:foreach(fun({_Spot, NPCGID}) ->
+						egs_users:delete(NPCGID) end, NPCList),
+					psu_party:stop(PartyPid)
+			end,
+			egs_zones:leave(User#users.zonepid, User#users.gid),
+			egs_universes:leave(User#users.uni),
+			egs_users:delete(User#users.gid),
+			io:format("game (~p): quit~n", [User#users.gid])
+	end.

src/egs_users.erl

@@ -101,8 +101,11 @@ init([]) ->
 	{ok, #state{}}.
 
 handle_call({find_by_pid, Pid}, _From, State) ->
-	[User] = [User || {_GID, User} <- State#state.users, User#users.pid =:= Pid],
-	{reply, User, State};
+	L = [User || {_GID, User} <- State#state.users, User#users.pid =:= Pid],
+	case L of
+		[] -> {reply, undefined, State};
+		[User] -> {reply, User, State}
+	end;
 
 handle_call({set_zone, GID, ZonePid, LID}, _From, State) ->
 	{GID, User} = lists:keyfind(GID, 1, State#state.users),