From 039011d9bbc30f2b8dc3bf9e4ede8add2119ce3d Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Pueyo Date: Mon, 21 Jan 2013 19:01:00 +0100 Subject: [PATCH] Added a deprecation Error --- src/classes/Deprecation.php | 35 ++++++++++++++++++++ src/classes/PocketMinecraftServer.php | 47 +++++++++++++++++++++------ 2 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 src/classes/Deprecation.php diff --git a/src/classes/Deprecation.php b/src/classes/Deprecation.php new file mode 100644 index 00000000..b4077b64 --- /dev/null +++ b/src/classes/Deprecation.php @@ -0,0 +1,35 @@ + "block.change", + ); + + +} \ No newline at end of file diff --git a/src/classes/PocketMinecraftServer.php b/src/classes/PocketMinecraftServer.php index 94be2432..929ce683 100644 --- a/src/classes/PocketMinecraftServer.php +++ b/src/classes/PocketMinecraftServer.php @@ -191,6 +191,12 @@ class PocketMinecraftServer{ public function addHandler($event, $callable, $priority = 5){ if(!is_callable($callable)){ return false; + }elseif(isset(Deprecation::$events[$event])){ + $sub = ""; + if(Deprecation::$events[$event] !== false){ + $sub = " Substitute \"".Deprecation::$events[$event]."\" found."; + } + console("[ERROR] Event \"$event\" has been deprecated.$sub [Adding handle to ".(is_array($callable) ? get_class($callable[0])."::".$callable[1]:$callable)."]"); } $priority = (int) $priority; $hnid = $this->handCnt++; @@ -227,7 +233,14 @@ class PocketMinecraftServer{ break; } } + }elseif(isset(Deprecation::$events[$event])){ + $sub = ""; + if(Deprecation::$events[$event] !== false){ + $sub = " Substitute \"".Deprecation::$events[$event]."\" found."; + } + console("[ERROR] Event \"$event\" has been deprecated.$sub [Handler]"); } + if($result !== false){ $this->trigger($event, $data); } @@ -533,18 +546,26 @@ class PocketMinecraftServer{ $call[(int) $evn["ID"]] = true; } $events->finalize(); - foreach($call as $evid => $boolean){ - $ev = $this->events[$evid]; - if(!is_callable($ev)){ - $this->deleteEvent($evid); - continue; + if(count($call) > 0){ + foreach($call as $evid => $boolean){ + $ev = $this->events[$evid]; + if(!is_callable($ev)){ + $this->deleteEvent($evid); + continue; + } + if(is_array($ev)){ + $method = $ev[1]; + $ev[0]->$method($data, $event); + }else{ + $ev($data, $event); + } } - if(is_array($ev)){ - $method = $ev[1]; - $ev[0]->$method($data, $event); - }else{ - $ev($data, $event); + }elseif(isset(Deprecation::$events[$event])){ + $sub = ""; + if(Deprecation::$events[$event] !== false){ + $sub = " Substitute \"".Deprecation::$events[$event]."\" found."; } + console("[ERROR] Event \"$event\" has been deprecated.$sub [Trigger]"); } return true; @@ -595,6 +616,12 @@ class PocketMinecraftServer{ public function event($event, $func){ if(!is_callable($func)){ return false; + }elseif(isset(Deprecation::$events[$event])){ + $sub = ""; + if(Deprecation::$events[$event] !== false){ + $sub = " Substitute \"".Deprecation::$events[$event]."\" found."; + } + console("[ERROR] Event \"$event\" has been deprecated.$sub [Attach to ".(is_array($func) ? get_class($func[0])."::".$func[1]:$func)."]"); } $evid = $this->evCnt++; $this->events[$evid] = $func;