From f47fa6d5dc41fd5edb3fae40e3b2e139c754936e Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Pueyo Date: Mon, 14 Jan 2013 16:42:57 +0100 Subject: [PATCH] Fixed race condition in API schedule() --- src/classes/PocketMinecraftServer.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/classes/PocketMinecraftServer.php b/src/classes/PocketMinecraftServer.php index ea2ae9b2..66d239c5 100644 --- a/src/classes/PocketMinecraftServer.php +++ b/src/classes/PocketMinecraftServer.php @@ -537,12 +537,13 @@ class PocketMinecraftServer{ return false; } $add = ""; + $chcnt = $this->scheduleCnt++; if($repeat === false){ - $add = ' unset($this->schedule['.$this->scheduleCnt.']);'; + $add = ' unset($this->schedule['.$chcnt.']);'; } - $this->schedule[$this->scheduleCnt] = array($callback, $data, $eventName); - $this->action(50000 * $ticks, '$schedule = $this->schedule['.$this->scheduleCnt.'];'.$add.'if(!is_callable($schedule[0])){unset($this->schedule['.$this->scheduleCnt.']);return false;} call_user_func($schedule[0], $schedule[1], $schedule[2]);', (bool) $repeat); - return $this->scheduleCnt++; + $this->schedule[$chcnt] = array($callback, $data, $eventName); + $this->action(50000 * $ticks, '$schedule = $this->schedule['.$chcnt.'];'.$add.'if(!is_callable($schedule[0])){unset($this->schedule['.$chcnt.']);return false;} call_user_func($schedule[0], $schedule[1], $schedule[2]);', (bool) $repeat); + return $chcnt; } public function action($microseconds, $code, $repeat = true){