From: <ral...@us...> - 2014-04-12 21:58:36
|
Revision: 9441 http://sourceforge.net/p/planeshift/code/9441 Author: ralphcampbell Date: 2014-04-12 21:58:34 +0000 (Sat, 12 Apr 2014) Log Message: ----------- Fix CID 1138763 Modified Paths: -------------- trunk/src/server/usermanager.cpp Modified: trunk/src/server/usermanager.cpp =================================================================== --- trunk/src/server/usermanager.cpp 2014-04-12 21:44:57 UTC (rev 9440) +++ trunk/src/server/usermanager.cpp 2014-04-12 21:58:34 UTC (rev 9441) @@ -758,9 +758,10 @@ { Debug2(LOG_USER, targetevent.character->GetClientID(),"UserManager handling target event for %s\n", targetevent.character->GetName()); targeter = clients->Find(targetevent.character->GetClientID()); - if(!targeter) - return; } + if(!targeter) + return; + if(targetevent.target) targeted = clients->Find(targetevent.target->GetClientID()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2015-01-10 23:44:59
|
Revision: 9693 http://sourceforge.net/p/planeshift/code/9693 Author: ralphcampbell Date: 2015-01-10 23:44:51 +0000 (Sat, 10 Jan 2015) Log Message: ----------- Fix 6751 - npcmenu with dead npc Modified Paths: -------------- trunk/src/server/usermanager.cpp Modified: trunk/src/server/usermanager.cpp =================================================================== --- trunk/src/server/usermanager.cpp 2015-01-10 20:49:57 UTC (rev 9692) +++ trunk/src/server/usermanager.cpp 2015-01-10 23:44:51 UTC (rev 9693) @@ -2668,6 +2668,11 @@ psserver->SendSystemError(client->GetClientNum(), "You are too far away from the NPC."); return; } + if(!npc->IsAlive()) + { + psserver->SendSystemError(client->GetClientNum(), "You can't talk to a dead person."); + return; + } npc->ShowPopupMenu(client); } else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rav...@us...> - 2016-04-19 14:09:45
|
Revision: 9899 http://sourceforge.net/p/planeshift/code/9899 Author: ravna-ps Date: 2016-04-19 14:09:43 +0000 (Tue, 19 Apr 2016) Log Message: ----------- Cleaned up some code. Modified Paths: -------------- trunk/src/server/usermanager.cpp Modified: trunk/src/server/usermanager.cpp =================================================================== --- trunk/src/server/usermanager.cpp 2016-04-19 12:37:50 UTC (rev 9898) +++ trunk/src/server/usermanager.cpp 2016-04-19 14:09:43 UTC (rev 9899) @@ -391,9 +391,9 @@ return false; } - // send an action override message which runs the animation + // send an action message which runs the animation // Notice that the client is responsible for finding the animation and determining if it exists at all. - psUserActionMessage msg(actor->GetClientID(), actor->GetEID(), animation, animation); + psUserActionMessage msg(actor->GetClientID(), actor->GetEID(), animation); msg.Multicast(actor->GetMulticastClients(), 0, PROX_LIST_ANY_RANGE); return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rav...@us...> - 2016-12-20 21:09:17
|
Revision: 9979 http://sourceforge.net/p/planeshift/code/9979 Author: ravna-ps Date: 2016-12-20 21:09:16 +0000 (Tue, 20 Dec 2016) Log Message: ----------- Added: A math script called "CalculateChanceOfMountSuccess" will be called before a player can mount, it gets 2 variables "Mount" and "Actor", both of GemActor type, it is supposed to set a variable named "Result", if it set to a positive number, it will allow the mounting, if it is set to 0 or not at all, it will not allow mounting. If the script does not exist on the server, it will be ignored. Modified Paths: -------------- trunk/src/server/usermanager.cpp Modified: trunk/src/server/usermanager.cpp =================================================================== --- trunk/src/server/usermanager.cpp 2016-12-17 22:56:09 UTC (rev 9978) +++ trunk/src/server/usermanager.cpp 2016-12-20 21:09:16 UTC (rev 9979) @@ -2403,6 +2403,27 @@ return; } + { + MathEnvironment env; + env.Define("Actor", client->GetActor()); + env.Define("Mount", mount->GetActorPtr()); + MathScriptEngine* eng = psserver->GetMathScriptEngine(); + MathScript* mountScript = eng->FindScript("CalculateChanceOfMountSuccess"); + if (mountScript) + { + mountScript->Evaluate(&env); + int result = env.Lookup("Result")->GetRoundValue(); + if (!result) + { + psserver->SendSystemError(client->GetClientNum(), + "You are not allowed to ride this mount."); + return; + } + } + } + //<eonwind> Result= 1; + //<eonwind> if Result = 0; fail + /*Client *targetClient = mount->GetClient(); if(targetClient) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ve...@us...> - 2017-07-05 21:43:52
|
Revision: 9997 http://sourceforge.net/p/planeshift/code/9997 Author: venalan Date: 2017-07-05 21:43:50 +0000 (Wed, 05 Jul 2017) Log Message: ----------- Fixing a small typo. Modified Paths: -------------- trunk/src/server/usermanager.cpp Modified: trunk/src/server/usermanager.cpp =================================================================== --- trunk/src/server/usermanager.cpp 2017-07-02 18:53:41 UTC (rev 9996) +++ trunk/src/server/usermanager.cpp 2017-07-05 21:43:50 UTC (rev 9997) @@ -618,7 +618,7 @@ "to be as intelligent as a stone", "to be an apprentice magic user", "to be an advanced apprentice in magic use", - "to be a competant magic user", + "to be a competent magic user", "to be an above average mage", "to be highly advanced in the arcane arts", "to be surrounded by a powerful magic aura" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |