mirror of
https://github.com/ChocoTaco1/TacoServer.git
synced 2026-01-20 00:24:49 +00:00
Reset FlagObs on F2-Name
This commit is contained in:
parent
e1069b6284
commit
e1771fbf88
|
|
@ -124,6 +124,14 @@ function Observer::setMode(%data, %obj, %mode, %targetObj)
|
|||
%obj.mode = %mode;
|
||||
}
|
||||
|
||||
function serverCmdObserveClient(%client, %target)
|
||||
{
|
||||
%client.observeFlyClient = "";
|
||||
%client.observingFlag = false;
|
||||
|
||||
parent::serverCmdObserveClient(%client, %target);
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
// Prevent package from being activated if it is already
|
||||
|
|
@ -209,11 +217,11 @@ function observeFlag(%client, %target, %type, %flagTeam)
|
|||
|
||||
// was the client observing a player before?
|
||||
if(%client.observeClient != -1)
|
||||
{
|
||||
observerFollowUpdate(%client, -1, false);
|
||||
messageClient(%client.observeClient, 'ObserverEnd', '\c1%1 is no longer observing you.', %client.name);
|
||||
%client.observeClient = -1;
|
||||
}
|
||||
{
|
||||
observerFollowUpdate(%client, -1, false);
|
||||
messageClient(%client.observeClient, 'ObserverEnd', '\c1%1 is no longer observing you.', %client.name);
|
||||
%client.observeClient = -1;
|
||||
}
|
||||
}
|
||||
else // Player
|
||||
{
|
||||
|
|
@ -242,7 +250,8 @@ function observeFlag(%client, %target, %type, %flagTeam)
|
|||
|
||||
// was the client observing a player before?
|
||||
if(%client.observeClient != -1)
|
||||
messageClient(%client.observeClient, 'ObserverEnd', '\c1%1 is no longer observing you.', %client.name);
|
||||
messageClient(%client.observeClient, 'ObserverEnd', '\c1%1 is no longer observing you.', %client.name);
|
||||
|
||||
%client.camera.getDataBlock().setMode(%client.camera, "observerFollow", %target.player);
|
||||
%client.setControlObject(%client.camera);
|
||||
%client.observeClient = %target;
|
||||
|
|
|
|||
Loading…
Reference in a new issue