From ee7d84dfbdbe0c008331a5c100c23265637879ce Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Fri, 19 Sep 2014 09:48:02 +0200 Subject: [PATCH] Fixed T_DOUBLE_COLON --- src/pocketmine/item/Item.php | 4 ++-- src/pocketmine/plugin/PluginDescription.php | 4 ++-- src/pocketmine/plugin/PluginManager.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pocketmine/item/Item.php b/src/pocketmine/item/Item.php index 5ed4bddef..8e99b4ac5 100644 --- a/src/pocketmine/item/Item.php +++ b/src/pocketmine/item/Item.php @@ -485,8 +485,8 @@ class Item{ $meta = ((int) $b[1]) & 0xFFFF; } - if(defined(Item::class . T_DOUBLE_COLON . strtoupper($b[0]))){ - $item = self::get(constant(Item::class . T_DOUBLE_COLON . strtoupper($b[0])), $meta); + if(defined(Item::class . "::" . strtoupper($b[0]))){ + $item = self::get(constant(Item::class . "::" . strtoupper($b[0])), $meta); if($item->getID() === self::AIR and strtoupper($b[0]) !== "AIR"){ $item = self::get(((int) $b[0]) & 0xFFFF, $meta); } diff --git a/src/pocketmine/plugin/PluginDescription.php b/src/pocketmine/plugin/PluginDescription.php index 71def7806..28f24948b 100644 --- a/src/pocketmine/plugin/PluginDescription.php +++ b/src/pocketmine/plugin/PluginDescription.php @@ -95,12 +95,12 @@ class PluginDescription{ } if(isset($plugin["load"])){ $order = strtoupper($plugin["load"]); - if(!defined(PluginLoadOrder::class . T_DOUBLE_COLON . $order)){ + if(!defined(PluginLoadOrder::class . "::" . $order)){ trigger_error("Invalid PluginDescription load", E_USER_ERROR); return; }else{ - $this->order = constant(PluginLoadOrder::class . T_DOUBLE_COLON . $order); + $this->order = constant(PluginLoadOrder::class . "::" . $order); } } $this->authors = []; diff --git a/src/pocketmine/plugin/PluginManager.php b/src/pocketmine/plugin/PluginManager.php index 83e10b7e4..fac195377 100644 --- a/src/pocketmine/plugin/PluginManager.php +++ b/src/pocketmine/plugin/PluginManager.php @@ -676,8 +676,8 @@ class PluginManager{ $ignoreCancelled = false; if(preg_match("/^[\t ]*\\* @priority[\t ]{1,}([a-zA-Z]{1,})$/m", (string) $method->getDocComment(), $matches) > 0){ $matches[1] = strtoupper($matches[1]); - if(defined(EventPriority::class . T_DOUBLE_COLON . $matches[1])){ - $priority = constant(EventPriority::class . T_DOUBLE_COLON . $matches[1]); + if(defined(EventPriority::class . "::" . $matches[1])){ + $priority = constant(EventPriority::class . "::" . $matches[1]); } } if(preg_match("/^[\t ]*\\* @ignoreCancelled[\t ]{1,}([a-zA-Z]{1,})$/m", (string) $method->getDocComment(), $matches) > 0){