Added compatibility for protocol 18, keep backwards compatibility wit…

…h 17, closes #11
shoghicp · Jul 28, 2014 · 559fbef · 559fbef
1 parent be1ee56
commit 559fbef
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/plugin.yml b/plugin.yml
@@ -1,5 +1,5 @@
 name: BigBrother
-version: 1.2.1-beta
+version: 1.2.2-beta
 api: 1.0.0
 description: "Allows the connection of Minecraft: PC clients to PocketMine-MP servers"
 author: shoghicp

diff --git a/src/shoghicp/BigBrother/BigBrother.php b/src/shoghicp/BigBrother/BigBrother.php
@@ -18,15 +18,16 @@
 namespace shoghicp\BigBrother;
 
 use phpseclib\Crypt\RSA;
+use pocketmine\event\player\PlayerRespawnEvent;
+use shoghicp\BigBrother\network\protocol\RespawnPacket;
 use shoghicp\BigBrother\network\translation\Translator;
 use pocketmine\event\Listener;
-use pocketmine\event\player\PlayerLoginEvent;
 use pocketmine\network\protocol\Info;
 use pocketmine\plugin\PluginBase;
 use shoghicp\BigBrother\network\Info as MCInfo;
 use shoghicp\BigBrother\network\ProtocolInterface;
 use shoghicp\BigBrother\network\ServerThread;
-use shoghicp\BigBrother\network\translation\Translator_17;
+use shoghicp\BigBrother\network\translation\Translator_18;
 use shoghicp\BigBrother\tasks\GeneratePrivateKey;
 
 class BigBrother extends PluginBase implements Listener{
@@ -78,8 +79,8 @@ public function onEnable(){
 			$this->getLogger()->warning("No motd has been set. The server description will be empty.");
 		}
 
-		if(Info::CURRENT_PROTOCOL === 17){
-			$this->translator = new Translator_17();
+		if(Info::CURRENT_PROTOCOL === 17 or Info::CURRENT_PROTOCOL === 18){
+			$this->translator = new Translator_18();
 		}else{
 			$this->getLogger()->critical("Couldn't find a protocol translator for #".Info::CURRENT_PROTOCOL .", disabling plugin");
 			$this->getPluginLoader()->disablePlugin($this);
@@ -144,17 +145,20 @@ public function onDisable(){
 	}
 
 	/**
-	 * @param PlayerLoginEvent $event
+	 * @param PlayerRespawnEvent $event
 	 *
-	 * @priority MONITOR
+	 * @priority NORMAL
 	 */
-	public function onLogin(PlayerLoginEvent $event){
-		/*$player = $event->getPlayer();
+	public function onRespawn(PlayerRespawnEvent $event){
+		$player = $event->getPlayer();
 		if($player instanceof DesktopPlayer){
-			if(!$event->isCancelled()){
-				$player->bigBrother_authenticate();
-			}
-		}*/
+			$pk = new RespawnPacket();
+			$pk->dimension = 0;
+			$pk->gamemode = $player->getGamemode();
+			$pk->difficulty = $player->getServer()->getDifficulty();
+			$pk->levelType = "default";
+			$player->putRawPacket($pk);
+		}
 	}
 
 }
diff --git a/...her/network/translation/Translator_17.php → ...her/network/translation/Translator_18.php b/...her/network/translation/Translator_17.php → ...her/network/translation/Translator_18.php
@@ -40,7 +40,7 @@
 use shoghicp\BigBrother\network\protocol\TimeUpdatePacket;
 use shoghicp\BigBrother\utils\Binary;
 
-class Translator_17 implements Translator{
+class Translator_18 implements Translator{