mirror of
https://github.com/gooba42/adventureland.git
synced 2026-10-24 14:10:14 -05:00
Merge pull request #227 from FreezePhoenix/patch-22
Update reject_deferred calls to include place for death and disappear events
This commit is contained in:
+2
-2
@@ -3096,13 +3096,13 @@ function init_socket(args)
|
|||||||
});
|
});
|
||||||
socket.on('death',function(data){
|
socket.on('death',function(data){
|
||||||
// unused now
|
// unused now
|
||||||
if(data.place) reject_deferred(data.place,{reason:data.reason||"not_found"});
|
if(data.place) reject_deferred(data.place,{place:data.place,reason:data.reason||"not_found"});
|
||||||
call_code_function("trigger_event","death",data);
|
call_code_function("trigger_event","death",data);
|
||||||
data.death=true;
|
data.death=true;
|
||||||
on_disappear(data);
|
on_disappear(data);
|
||||||
});
|
});
|
||||||
socket.on("disappear",function(data){
|
socket.on("disappear",function(data){
|
||||||
if(data.place) reject_deferred(data.place,{reason:data.reason||"not_found"});
|
if(data.place) reject_deferred(data.place,{place:data.place,reason:data.reason||"not_found"});
|
||||||
on_disappear(data);
|
on_disappear(data);
|
||||||
});
|
});
|
||||||
socket.on('entities',function(data){
|
socket.on('entities',function(data){
|
||||||
|
|||||||
Reference in New Issue
Block a user