cleanedup endMap / beginMap bugs

This commit is contained in:
kremsy
2014-05-09 12:14:25 +02:00
parent a51d5423a3
commit d208be32c8
3 changed files with 27 additions and 16 deletions

View File

@ -185,10 +185,8 @@ class CallbackManager {
$this->maniaControl->mapManager->handleBeginMap($callback);
$this->triggerCallback($callbackName, $callback);
break;
case 'ManiaPlanet.EndMatch': // TODO temporary fix
if ($this->maniaControl->mapManager->getCurrentMap()->getGame() == 'sm') {
$this->triggerCallback($callbackName, $callback);
}
case 'ManiaPlanet.EndMatch':
$this->triggerCallback($callbackName, $callback);
break;
case 'ManiaPlanet.EndMap':
$this->maniaControl->mapManager->handleEndMap($callback);

View File

@ -45,7 +45,7 @@ class LibXmlRpcCallbackManager implements CallbackListener {
break;
case 'BeginMap':
case 'LibXmlRpc_BeginMap':
$this->maniaControl->mapManager->handleScriptBeginMap($data[0]);
$this->maniaControl->mapManager->handleScriptBeginMap($data[1], $data[2]);
break;
case 'LibXmlRpc_BeginSubmatch':
$this->maniaControl->callbackManager->triggerCallback(Callbacks::BEGINSUBMATCH, $data[0]);
@ -64,7 +64,7 @@ class LibXmlRpcCallbackManager implements CallbackListener {
break;
case 'EndMap':
case 'LibXmlRpc_EndMap':
$this->maniaControl->mapManager->handleScriptEndMap($data[0]);
$this->maniaControl->mapManager->handleScriptEndMap($data[1]);
break;
case 'LibXmlRpc_EndMatch':
$this->maniaControl->callbackManager->triggerCallback(Callbacks::ENDMATCH, $data[0]);